[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bzr commit raises a weird conflict
From: |
Bastien |
Subject: |
Re: bzr commit raises a weird conflict |
Date: |
Tue, 09 Apr 2013 13:23:31 +0200 |
User-agent: |
Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) |
Hi Giorgos,
Giorgos Keramidas <address@hidden> writes:
> That's because leim/ja-dic/ was removed recently, but if you are merging
> in an unclean checkout (with build output from previous builds), bzr
> notices that:
>
> (a) The directory should be removed as part of the merge
> (b) The directory is not empty
>
> So it takes the safer approach of aborting the merge with a conflict,
> instead of blindly removing the directory.
>
> This is an artifact of the fact that bzr likes tracking directory
> changes too, as part of the branch history. In this case it acts a bit
> silly, because there are *no* files tracked remaining after the
> directory is fully removed from a branch, so it should just go ahead and
> remove the directory from the branch, but leave the filesystem intact.
> Since there are no files left in the originally tracked directory,
> future merges or updates will not care about this path anyway.
>
> Running 'bzr resolve --take-other' basically tells bzr to ignore
> whatever happens to exist in the filesystem because of the local branch
> and consider the 'source branch' the authoritative source of what it
> should do with leim/ja-dic/. And it solves this minor merge problem
> ;)
Thanks for the detailed explanation -- will remember this next time.
--
Bastien
Re: bzr commit raises a weird conflict, Giorgos Keramidas, 2013/04/09