RE: Merging r33536 to the issue-2897-take2 branch

Yes, you are correct. I realised it later.

I used my trunk binary which is week old(may be more than a week), that trunk binary has shown 'tree-conflict' on r33536 in --dry-run mode.

So I thought of doing that separately to address that issue.

Later I realised that recent trunk binary has a fix for that already.

With regards
Kamesh Jayachandran

-----Original Message-----
From: Daniel Shahaf [mailto:d.s_at_daniel.shahaf.name]
Sent: Thu 11/6/2008 8:16 PM
To: Kamesh Jayachandran
Cc: dev_at_subversion.tigris.org
Subject: Merging r33536 to the issue-2897-take2 branch
 
Kamesh, I'm curious, why did you merge r33536 separately? (I thought all
bugs that rename unearthed have been fixed already.)

    % svn log https://svn.collab.net/repos/svn/branches/issue-2897-take2 -l3
    ------------------------------------------------------------------------
    r34075 | kameshj | 2008-11-06 16:11:28 +0200 (Thu, 06 Nov 2008) | 4 lines

    On issue-2897-take2 branch:

    Merge r33537 through r34074 from trunk.

    ------------------------------------------------------------------------
    r34074 | kameshj | 2008-11-06 14:56:23 +0200 (Thu, 06 Nov 2008) | 4 lines

    On issue-2897-take2 branch:

    Merge r33536 from trunk.

    ------------------------------------------------------------------------
    r34072 | kameshj | 2008-11-06 13:45:15 +0200 (Thu, 06 Nov 2008) | 4 lines

    On issue-2897-take2 branch:

    Merge r33235 through r33535 from trunk.

    ------------------------------------------------------------------------

...

    % svn log https://svn.collab.net/repos/svn/trunk/ -r33536
    ------------------------------------------------------------------------
    r33536 | danielsh | 2008-10-08 03:02:49 +0200 (Wed, 08 Oct 2008) | 4 lines

    Rename all files on trunk with spaces in their name.

    * tools/buildbot/slaves/win32-xp VS2005/: Rename to..
    * tools/buildbot/slaves/win32-xp-VS2005/: This.
    ------------------------------------------------------------------------
Received on 2008-11-06 18:14:32 CET