[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Stefan Monnier |
Subject: |
Re: merge conlict? |
Date: |
Mon, 25 Jan 2010 22:02:46 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
>>>>> "Andreas" == Andreas Schwab <address@hidden> writes:
> Eli Zaretskii <address@hidden> writes:
>>> Date: Sun, 24 Jan 2010 23:52:26 -0500
>>> From: "Mark A. Hershberger" <address@hidden>
>>> To: address@hidden
>>> Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r99379: merge conflict
>>> Content-Type: text/plain; charset="us-ascii"
>>>
>>> ------------------------------------------------------------
>>> revno: 99379 [merge]
>>> committer: Mark A. Hershberger <address@hidden>
>>> branch nick: trunk
>>> timestamp: Sun 2010-01-24 23:52:26 -0500
>>> message:
>>> merge conflict
>>
>> What does this "merge conflict" in the commit message mean? Why do
>> so many unrelated files (see below) seem to be modified in one go?
> That's a normal merge of trunk into a branch. Not much different from
> eg. address@hidden
I've just added
append_revisions_only = True
to the .../trunk/.bzr/branch/branch.conf which should reject a "bzr
push" that does this kind of ancestor-shifting.
Stefan
- Re: merge conlict?, (continued)
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Lennart Borgman, 2010/01/26
- Re: merge conlict?, Karl Fogel, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Stephen J. Turnbull, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Stefan Monnier, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?,
Stefan Monnier <=
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
Re: merge conlict?, Teemu Likonen, 2010/01/25