RE: Merge problem with different users

2010-09-13 Thread Ungruhe, Michael
; 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 different users (on different

RE: Merge problem with different users

2010-09-06 Thread Ungruhe, Michael
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 users On Fri

Re: Merge problem with different users

2010-09-03 Thread Stefan Sperling
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 made on the