[svk-users] svk pull+merge+push - why do I have to merge twice?

[Frank McIngvale]

Hi, I can't figure out why doing pull+merge+push is requiring me to do the
same merge twice.

Example (this is with svn 1.4.4 server and svk 2.0.2, both on WinXP):

SVN repo is: svn://localhost/test

$ svk mirror //mirrorA/test svn://localhost/test
$ svk cp -p -m "Local repo" //mirrorA/test //localA/test
$ svk sync //mirrorA/test

$ svk co //localA/test testA
$ cd testA

OK, now someone changes svn://localhost/test and I make a conflicting change
locally. smerge does what I expect (but requires more steps):

<from working dir "testA/">
$ svk ci -m "Commit my conflict"
$ svk sync //mirrorA/test
$ svk smerge -m "pulling updates" //mirrorA/test //localA/test

svk tells me about the conflict and I merge it OK. Then:

$ svk update
$ svk smerge -m "pushing merged version" //localA/test //mirrorA/test

.. and all is well.

Now if I do the same thing with push/pull:

<from working dir "testA/">
$ svk ci -m "Commit my conflict"
$ svk pull

Once again, svk tells me I need to merge and that part works fine. However,
immediately after the merge when I do:
$ svk push

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?

frank
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-users/attachments/20070809/15b9fb8b/attachment-0001.htm