On Jun 29, 2012, at 16:38, jwenn...@rockwellcollins.com wrote:
> The svn diff syntax you provided works exactly as expected.
>
> I would suggest adding this to the online subversion manual at
> http://svnbook.red-bean.com/en/1.7/index.html.
>
> "At this point, the wise thing to do is look a
188-400, 221 3rd Ave SE , Cedar Rapids, IA, 52401, USA
Phone: 319-263-4597 / Fax: 319-263-6067
jwenn...@rockwellcollins.com
www.rockwellcollins.com
From: Johan Corveleyn
To: jwenn...@rockwellcollins.com
Cc: users@subversion.apache.org
Date: 06/29/2012 09:14 AM
Subject: Re:
[ Replying back to the users@ list. Please use 'reply all' to keep the
discussion on the list. Also, if possible, please use plain text
emails, and do not top post (i.e. put your reply at the bottom of the
thing you're replying to, or inline). More below ... ]
> On Thu, Jun 28, 2012 at 10:59 PM,
On Thu, Jun 28, 2012 at 10:59 PM, wrote:
>
> Here is the scenario:
>
> User 1
> 1. create branches/X
> 2. svn checkout branches/X to local machine
> 3. modify file.txt
> 4. commit changes
>
>
> Another user, User 2,
> 5. create branches/Y
> 6. svn checkout branches/Y to his local
Here is the scenario:
User 1
1. create branches/X
2. svn checkout branches/X to local machine
3. modify file.txt
4. commit changes
Another user, User 2,
5. create branches/Y
6. svn checkout branches/Y to his local machine
7. merge branches/X to local machine(and thus m
