On Wed, Sep 1, 2010 at 2:11 PM, Jeremy Mordkoff <jlm_at_zeevee.com> wrote:
> Just an FYI for anyone that does merging.
>
> I just spent an hour cleaning up a mess with my mergeinfo's. I missed a
> hint that I was about to do something really stupid.
>
> Here's the merge:
>
>
> [release_at_zaz1 rel_2_5]$ svn merge $B/rel_2_5_3
> --- Merging r14352 through r14594 into '.':
> U lcast/build/images/nand/root/lcast/etc/post_install.sh
> U lcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
> G .
> [release_at_zaz1 rel_2_5]$ svn commit -m 'merge from rel_2_5_3 of a fix made
> in trunk'
> Sending .
> Sending lcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
> Sending lcast/build/images/nand/root/lcast/etc/post_install.sh
> Transmitting file data ..
> Committed revision 14595.
>
>
> The hint I missed was the G next to the '.'. That should have told me that
> there were changes in my workspace, and since I never knowingly commit local
> changes and merges at the same time, I should have stopped right there.
>
> Also, I have some tools that I use to keep track of branches and stuff. Is
> there a good place to publish them?
>
I'd like to see them very much. If you don't publish them anywhere, please
send them my way.
Cheers / Erik
>
> JLM
>
Received on 2010-09-01 14:55:07 CEST