RE: Merging r33536 to the issue-2897-take2 branch
From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Thu, 6 Nov 2008 22:41:23 +0530
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
-----Original Message-----
% svn log https://svn.collab.net/repos/svn/branches/issue-2897-take2 -l3
On issue-2897-take2 branch:
Merge r33537 through r34074 from trunk.
------------------------------------------------------------------------
On issue-2897-take2 branch:
Merge r33536 from trunk.
------------------------------------------------------------------------
On issue-2897-take2 branch:
Merge r33235 through r33535 from trunk.
------------------------------------------------------------------------
...
% svn log https://svn.collab.net/repos/svn/trunk/ -r33536
Rename all files on trunk with spaces in their name.
* tools/buildbot/slaves/win32-xp VS2005/: Rename to..
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.