[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch (original) (raw)
"Martin v. Löwis" martin at v.loewis.de
Fri Jan 30 04:09:17 CET 2009
- Previous message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
- Next message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
svn up svnmerge ... conflicts svn revert -R . svn up svnmerge ... same conflicts
Ah. In the 3.0 branch, always do "svn revert ." after svnmerge. It's ok (Nick says it isn't exactly ok, but I don't understand why)
Martin
- Previous message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
- Next message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]