Hi, I can't figure out why doing pull+merge+push is requiring me to do the same merge twice.<br><br>Example (this is with svn 1.4.4 server and svk 2.0.2, both on WinXP):<br><br>SVN repo is: svn://localhost/test<br><br>
$ svk mirror //mirrorA/test svn://localhost/test<br>$ svk cp -p -m "Local repo" //mirrorA/test //localA/test<br>$ svk sync //mirrorA/test<br><br>$ svk co //localA/test testA<br>$ cd testA<br><br>OK, now someone changes svn://localhost/test and I make a conflicting change locally. smerge does what I expect (but requires more steps):
<br><br><from working dir "testA/"><br>$ svk ci -m "Commit my conflict"<br>$ svk sync //mirrorA/test<br>$ svk smerge -m "pulling updates" //mirrorA/test //localA/test<br><br>svk tells me about the conflict and I merge it OK. Then:
<br><br>$ svk update<br>$ svk smerge -m "pushing merged version" //localA/test //mirrorA/test<br><br>.. and all is well. <br><br>Now if I do the same thing with push/pull:<br><br><from working dir "testA/">
<br>$ svk ci -m "Commit my conflict"<br>$ svk pull<br><br>Once again, svk tells me I need to merge and that part works fine. However, immediately after the merge when I do:<br>$ svk push<br><br>It makes me redo the merge I just did. I thought "push" and "pull" were a shortcut for the sync+smerge operations, but it seems like I'm missing a step somewhere. What am I missing?
<br><br>frank<br><br><br>