Re: Bzr document unclear. There is no "conflict markers".

["Jan Djärv" <jan.h.d@swipnet.se>]

Eli Zaretskii skrev 2010-01-03 16.10:
>> Date: Sun, 03 Jan 2010 15:33:50 +0100
>> From: Jan Djärv<jan.h.d@swipnet.se>
>> CC: emacs-devel@gnu.org
>>
>> If I modify one file it just shows that as modified.  I can't reproduce the
>> original error.  But it still doesn't show any conflict markers:
>>
>> % bzr merge
>> bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted
>> changes (See bzr status).
>
> I see that as well when I have uncommitted changes on a branch, so
> it's probably normal.  Note that the wiki tells you to "bzr merge"
> _before_ you start hacking.  But you are right that this issue should
> be more explicit; I will edit the wiki (unless someone more
> knowledgeable points out where we both are mistaken).

Great.

>
>> I kind of expected merge to merge changes without me having to check in into
>> the quickfix branch first.
>
> Why do you need that?  It is so easy to uncommit on a local branch
> that committing there shouldn't be a hard decision.  It's not like you
> are going to pollute a public repository.

There is the question of commit logs and Changelogs.  There will be many local 
logs, and as I understood it from previous discussion, these will all 
propagate to savannah when I push from trunk.

	Jan D.