e.org; Strucken, Andreas
Subject: Re: Merge problem with different users
On Mon, Sep 06, 2010 at 02:44:30AM -0700, Ungruhe, Michael wrote:
> The "merge user" is just a user account. Since we noticed that the
> problem described earlier only occurs when the merging is made by
>
On Mon, Sep 06, 2010 at 02:44:30AM -0700, Ungruhe, Michael wrote:
> The "merge user" is just a user account. Since we noticed that the
> problem described earlier only occurs when the merging is made by
> different users (on different user accounts), we created a new user
> account (called mergeuse
the users itself are still different, but they use
the same account.
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Freitag, 3. September 2010 11:08
To: Ungruhe, Michael
Cc: users@subversion.apache.org; Strucken, Andreas
Subject: Re: Merge problem with different use
On Fri, Sep 03, 2010 at 12:53:34AM -0700, Ungruhe, Michael wrote:
> Hi,
>
>
>
> We noticed the following problem:
>
>
>
> We are usually working on the trunk, but for a change request we created a
> branch. Development continued on both, the trunk and the branch.
>
> Some changes were ma
Hi,
We noticed the following problem:
We are usually working on the trunk, but for a change request we created a
branch. Development continued on both, the trunk and the branch.
Some changes were made on the trunk including the deletion of some files, all
changes were committed to the t
