Unmerge?

[Eric Berry]

:) Right! Sorry. Was a bad test I guess hehe.

I tried it again with better files this time.

Awesome. :) It's definitely going on my wiki page.

Thanks again!
Eric

On Thu, Apr 30, 2009 at 7:03 PM, Robert Collins <
robert.collins at canonical.com> wrote:

> On Thu, 2009-04-30 at 18:49 -0700, Eric Berry wrote:
> >
> > The files that got reverted were test files with just a single line in
> > them, and there are really only two files in the branch.
> >
> > So, any changes to them would be seen as conflicts correct?
>
> Small files will tend to conflict on any change simply because the
> change is likely to be adjacent to a region that has altered, so it
> looks like a conflict.
>
> 1-line files are really pathological :)
>
> If the 2->3 change was
> -A
> +B
>
> and a 3->4 change did
> -B
> +C
>
> Then reversing the 2->3 change tried to do
> -B
> +A
>
> But there is no B, only C -> conflict.
>
> -Rob
>



-- 
Learn from the past. Live in the present. Plan for the future.
11101000
http://www.townsfolkdesigns.com/blogs/elberry
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090430/807675a4/attachment.htm