[svk-devel] smerge/pull with renames
jason at planet57.com
Wed Mar 28 18:45:33 EDT 2007
Hi... I saw some changes to svk today and I tried this again... seems
to be working now. The t/07smerge-rename3 test seems to be okay too,
its not complaining about passing unexceptionally.
Would it be possible to get --fix-rename flags on `svk push` and `svk
pull`.... and perhaps some way to make the --fix-rename sticky? The
refactoring work really always needs this to correctly pick up changes.
* * *
Upon further inspection, looks like there might be something wrong
with merging changes w/renames back to their source. Ran into a
strange problem where merging back conflicted on an example file,
which was unexpected since I just did a sm --fix-renames from the
source to sync up the changes. When merging back to the source,
accepting "yours" ended up merging a change 2 revisions back into the
source. Very odd.
Is this related to the bits in the test which are marked as
"todo_skip 'not working', 5;" ?
Will look into this further. Not sure I understand how the .t files
really work or I would try to update them. But I can probably get a
simple example with a bash script to reproduce.
I think for now the merging from source to target w/renames gets me
moving forward, though eventually I'm going to need to merge these
changes back after the refactoring is finished... and I'd like to not
have to worry about it picking strange bases to merge with or
conflict on stuff, even if the merge from the opposite direction was
just run cleanly.
On Mar 20, 2007, at 2:48 AM, Chia-Liang Kao wrote:
> Hi Jason,
> On 20/03/07, Jason Dillon <jason at planet57.com> wrote:
>> 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.
> Sorry I haven't had much time for this lately. If you can create a .t
> file which contains how to reproduce the problem and the expected
> behaviour, it'd help a lot. see any other .t file from the
> distribution as example. Meanwhile, there was a recent fix about copy
> tracking at r2323. See if that fixes your problem.
> svk-devel mailing list
> svk-devel at bestpractical.com
More information about the svk-devel