glitch with mergeinfo (recreation of merge source shown as eligible)
|Reported by:||Christian Boos||Owned by:|
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.
For the context, see:
- log:sandbox/mercurial-plugin-0.11&mode=path_history (another glitch there btw, no color code)
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.