[svk-devel] smerge/pull with renames
Jason Dillon
jason at planet57.com
Tue Mar 20 05:22:31 EDT 2007
FYI, I did get --track-rename to work *once*... but all changes made
to the file after I renamed its parent directory in my branch have
never made it.
--jason
On Mar 20, 2007, at 1:04 AM, Viktor Štujber wrote:
> I am planning to clean up some of our "vendor's" badly placed/named
> directories, and your info is somewhat disturbing...
>
> It is true that merge-to-moved-destination didn't work previously
> due to some problems, but that should have been fixed.
> See http://netvor.sk/~umage/temp/svk-rename-sux.txt for info about
> what I got then.
> That case has been covered - see t/07smerge-rename-dest.t.
>
> Btw...
> > svk sm --track-rename //mirrors/svktest //svktest
> > Collecting renames, this might take a while.
> > U test-module/test.txt - test-module2/test.txt
> > But this did not appear to update the text at at all
> Just a sanity check, did you run 'svk update .' on that directory
> after the merge? (since you did the merge inside the repo)
>
>
> _______________________________________________
> svk-devel mailing list
> svk-devel at bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20070320/dea4e81b/attachment.htm
More information about the svk-devel
mailing list