[svk-users] mirroring and smerge

[David Morton]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I thought I had this figured out some time ago, but now it's so messed  
up I don't  know what to do.

For the damage, see http://www.maiamailguard.com/maia/changeset/1244

As you can see when I tried to push one little fix, it got crazy and  
recopied the whole branch, losing all the previous work.
(Some svn merging brought it back, but it's ugly) (Now I wonder if I  
should have done a revision copy instead of a merge)

Anyway.  Now when I try to push some changes back, it's going too far  
back in the history. I kind of wondered when I pushed that one, as it  
had too much info in the log.

Is there any way to give smerge a hint as to where it is supposed to  
look back to? Ie, if I do a svk pull, svk up, and there are no new  
changes in my local copy, then the next time I do a push I want only  
new changes from here on out to be pushed.






David Morton
Maia Mailguard http://www.maiamailguard.com
mortonda at dgrmm.net



-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)

iD8DBQFIkLteUy30ODPkzl0RAhyXAJ9ohnlbHtK7WUQKp6tjPCYyYUZj2ACgluDO
pxEsfKO2wGC6msVlXx4vZIs=
=Pk9Z
-----END PGP SIGNATURE-----