Edgewall Software

Opened 11 years ago

Last modified 2 years ago

#10547 new defect

glitch with mergeinfo (recreation of merge source shown as eligible)

Reported by: Christian Boos Owned by:
Priority: low Milestone: next-stable-1.4.x
Component: version control/browser Version: 0.12dev
Severity: minor Keywords: svnmergeinfo
Cc: Branch:
Release Notes:
API Changes:
Internal Changes:


It seems that we show the revision corresponding to the re-creation of a deleted merge source as eligible while svn does not:

$ svn merge ^/sandbox/mercurial-plugin-0.11 --record-only
--- Recording mergeinfo for merge of r8941 through r10935 into '.':
 U   .

$ svn merge ^/plugins/0.11/mercurial-plugin --record-only
--- Recording mergeinfo for merge of r4247 through r8935 into '.':
 G   .
--- Recording mergeinfo for merge of r8936 through r10935 into '.':
 G   .

$ svn diff
Index: .
--- .   (revision 10935)
+++ .   (working copy)

Property changes on: .
Modified: svn:mergeinfo
   Merged /sandbox/mercurial-plugin-0.11:r8941-10935
   Merged /plugins/0.11/mercurial-plugin:r9953-10935

$ svn ci -m "TracMercurial for 0.12: cleanup mergeinfo (everything was up-to-date)"
Sending        .

Committed revision 10936.

$ svn mergeinfo ^/sandbox/mercurial-plugin-0.11 --show-revs=eligible


In particular, note the initial command, we merge all pending changes from ^/sandbox/mercurial-plugin-0.11 and svn says "r8941 through r10935" and the corresponding commit, r10936, shows that this corresponds to the recording of the merge of r8943.

The last command shows that according to Subversion there's no more eligible revisions from that branch, but we will nevertheless show r8940 as eligible, in source:plugins/0.12/mercurial-plugin.

For the context, see:

We see that sandbox/mercurial-plugin-0.11@8827 was moved to plugins/multirepos/mercurial-plugin-0.12@8937 in r8937, and that after this move, the path sandbox/mercurial-plugin-0.11 was recreated in r8940, and got a modification in r8943. Subversion considers that r8943 was eligible for merge, but not r8940 (quite logically). We should do the same.

Attachments (0)

Change History (3)

comment:1 by Ryan J Ollos, 8 years ago

Milestone: next-minor-0.12.xnext-stable-1.0.x

comment:2 by Ryan J Ollos, 6 years ago

Milestone: next-stable-1.0.xnext-stable-1.2.x

Moved ticket assigned to next-stable-1.0.x since maintenance of 1.0.x is coming to a close. Please move the ticket back if it's critical to fix on 1.0.x.

comment:3 by Ryan J Ollos, 2 years ago

Milestone: next-stable-1.2.xnext-stable-1.4.x

Modify Ticket

Change Properties
Set your email in Preferences
as new The ticket will remain with no owner.
The ticket will be disowned.
as The resolution will be set. Next status will be 'closed'.
The owner will be changed from (none) to anonymous. Next status will be 'assigned'.

Add Comment

E-mail address and name can be saved in the Preferences .
Note: See TracTickets for help on using tickets.