[Python-Dev] Merging flow (original) (raw)
"Martin v. Löwis" martin at v.loewis.de
Thu Dec 11 21:03:03 CET 2008
- Previous message: [Python-Dev] Merging flow
- Next message: [Python-Dev] Merging flow
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
I believe that's difficult when you previously merged from the trunk to the py3k branch - the merged change to the svnmerge related properties on the root directory gets in the way when svnmerge attempts to update them on the maintenance branch.
That's what started this thread, and so far nobody has come up with a workaround.
The work-around is fairly straight-forward:
- inspect the conflict file (I forgot its name - something like dir-props), and verify that the only conflict is in the missing merge info from trunk to py3k
- svn resolved .
It seems to me that svnmerge.py should just be able to do a svn revert on the affected properties in the maintenance branch before it attempts to modify them, but my svn-fu isn't strong enough for me to say that for sure.
See above. svnmerge overwrites the property after it has conflicted, so the only additional action to take is to declare that a resolution.
Regards, Martin
- Previous message: [Python-Dev] Merging flow
- Next message: [Python-Dev] Merging flow
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]