[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
|
From: |
Eli Zaretskii |
|
Subject: |
Re: merge conlict? |
|
Date: |
Tue, 26 Jan 2010 06:26:57 +0200 |
> From: Richard Stallman <address@hidden>
> CC: address@hidden, address@hidden
> Date: Mon, 25 Jan 2010 19:04:43 -0500
>
> Both commits merge trunk into a branch.
>
> "Merged trunk into a branch" implies that the branch has changed and
> the trunk has not. If so, why do we get a notification about it? The
> notifications are supposed to be for changes in the trunk, not for
> changes in branches, right?
Because the history DAG of the repository changed. In Bazaar, history
changes are also changes, not just text changes in the versioned
files.
Re: merge conlict?, Katsumi Yamaoka, 2010/01/27