bugmonotone - Bugs: bug #25859, disapprove does not resurrect...

 
 

You are not allowed to post comments on this tracker with your current authentification level.

bug #25859: disapprove does not resurrect files properly

Submitted by:  Ludovic Brenta <lbrenta>
Submitted on:  Sat 14 Mar 2009 02:02:36 PM UTC  
 
Category: NoneSeverity: 3 - Normal
Item Group: NoneStatus: None
Privacy: PublicAssigned to: None
Open/Closed: Open
mtn version --full: 

monotone 0.40 (base revision: 5ccc279f9dea0444b47f03dd5291ecc985fcb7f6)
Running on : Linux 2.6.26-1-amd64 #1 SMP Mon Dec 15 17:25:36 UTC 2008 x86_64
C++ compiler : GNU C++ version 4.3.1
C++ standard library: GNU libstdc++ version 20080705
Boost version : 1_34_1
Changes since base revision:
unknown

Sat 14 Mar 2009 02:02:36 PM UTC, original submission:

Consider the following revision graph:

1
|\
2 3
| |
4 |
| /
5

Revision 1 contains file a.
Revision 2 removes a.
Revision 3 modifies a.
Revision 4 disapproves revision 2.
Revision 5 is the result of "mtn merge".

The problem is that if you look at "mtn log --last=1" you see:

|\ Revision: 21f26345547d7660939afe1741402e570a3d4280
| | Ancestor: 3d64d042bf7c34efa00ab804ee45d3d87dd84feb
| | Ancestor: 7bb800f87254e9dd214f9ea600475b86e186a1c7
| | Author: Ludovic Brenta
| | Date: 2009-03-14T13:44:07
| | Branch: a
| |
| | Deleted entries:
| | a
| | Added files:
| | a
| |
| | ChangeLog:
| |
| | merge of '3d64d042bf7c34efa00ab804ee45d3d87dd84feb'
| | and '7bb800f87254e9dd214f9ea600475b86e186a1c7'

and the changes made in revision 3 are lost (i.e. a has its contents from revision 1).

The log for revision 4 (the disapproval) gives us a clue:

o -----------------------------------------------------------------
| Revision: 7bb800f87254e9dd214f9ea600475b86e186a1c7
| Ancestor: c0b5b67d99eba388550f3bbab47089a6fa7d301c
| Author: Ludovic Brenta
| Date: 2009-03-14T13:42:05
| Branch: a
|
| Added files:
| a
|
| ChangeLog:
|
| disapproval of revision 'c0b5b67d99eba388550f3bbab47089a6fa7d301c'

It says it "added" a, not that it "resurrected" it.

Ludovic Brenta <lbrenta>
Project Member

 

Attached Files
file #17685:  g.mtn added by lbrenta (304kB - application/octet-stream - A database with the revision graph, showing the problem)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by lbrenta (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follows 1 latest change.

    Date Changed By Updated Field Previous Value => Replaced By
    Sat 14 Mar 2009 02:02:36 PM UTClbrentaAttached File-=>Added g.mtn, #17685

    Back to the top


    Powered by Savane 3.1-cleanup