[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Committing Checkouts from multiple locations in a single commit.

From: Micke <u23104331_at_telia.com>
Date: 2007-05-04 22:33:46 CEST

Micke wrote:
> Cuban wrote:
>> Good morning,
>>
>> Forgive me newbie like question, but I did agressively search the web for my
>> answer to no avail. If someone would answer the below question, I'd be
>> forever greatful.
>>
>> How can I commit two seperately checked out folders silmultaneously, so that
>> when viewing the comments in SVN, all the files were commited as the same
>> revision?
>>
>> Here's a diagram of my WORKING Copy configuration:
>> C:\SVN-
>> |_Checkout Folder 1\Files and folders here
>> |_Checkout Folder 2\Files and folders here
>>
>> Both checkout folders are seperate checkouts from different locations in the
>> repository. If I run this command:
>> svn commit "c:\svn" -m "Commited both folders"
>>
>> Only Checkout Folder 1, and all of it's subdirectories/code is commited. - I
>> need checkout 2 subdirectories and code to be committed as well, under the
>> same revision.
>>
>> The reason for this desire is that I'm automating the process in which we
>> 'mark' builds in our software (essentially just mark edit a text file and
>> relate that revision with the text file), but I pull code from several
>> repository locations to do so. So, I could easily automate the process by
>> looping through each file individually and commiting it, but then I am
>> making like 10 Revisions to mark a single build.
>>
>> I appreciate anyone who took the time to go through this message. Thanks
>> again for any assistance I recieve.
>>
>> Ryan.
>
> Hi!
>
> Since you are on Windows, you can use TortoiseSVN to achieve it. I use
> it this way all the time. The easiest way is to create an empty folder
> somewhere in your repository. In the checkout of that dummy folder, you
> can checkout whatever you want:
>
> C:\SVN-Dummy (the empty folder)
> |_Checkout Folder 1\Files and folders here
> |_Checkout Folder 2\Files and folders here
>
> You can not update or commit using the dummy, but rather you select all
> the checked out folders below in the explorer and update/commit.
> As an added bonus you have a functional "modified" icon on the dummy folder.
>
> /Micke

Tested it with the command line client. Seems to work:
C:\Temp>svn --version
svn, version 1.4.2 (r22196)
   kompilerad Nov 3 2006, 16:53:07

// Checked out wrapper - and it is empty

C:\Temp>cd wrapper

C:\Temp\Wrapper>svn info
Sökväg: .
URL: https://x.y.z/svn/test/Dummy
Arkivrot: https://x.y.z/svn/test
Arkivets UUID: ce18c596-17a5-48f2-8801-f9f72dffaa8a
Revision: 6
Nodtyp: katalog
Schemalagd: normal
Författare till senaste ändringen: micke
Senast ändrad i revision: 6
Datum för senaste ändringen: 2007-05-04 22:13:29 +0200 (fr, 04 maj 2007)

C:\Temp\Wrapper>dir
 Directory of C:\Temp\Wrapper

2007-05-04 22:16 <DIR> .
2007-05-04 22:16 <DIR> ..
               0 File(s) 0 bytes
               2 Dir(s) 1 328 046 080 bytes free

// Filling wrapper with folders from other parts of the repository

C:\Temp\Wrapper>svn co https://x.y.z/svn/test/A/AA AA
A AA\FILE-A.TXT
Checkade ut revision 6.

C:\Temp\Wrapper>svn co https://x.y.z/svn/test/B/BB BB
A BB\FILE-B.TXT
Checkade ut revision 6.

// Wrapper still thinks it is empty

C:\Temp\Wrapper>svn ls

C:\Temp\Wrapper>dir

 Directory of C:\Temp\Wrapper

2007-05-04 22:18 <DIR> .
2007-05-04 22:18 <DIR> ..
2007-05-04 22:17 <DIR> AA
2007-05-04 22:18 <DIR> BB
               0 File(s) 0 bytes
               4 Dir(s) 1 328 025 600 bytes free

// Editing both files here

C:\Temp\Wrapper>svn status AA
M AA\FILE-A.TXT

C:\Temp\Wrapper>svn status BB
M BB\FILE-B.TXT

// AA and BB are still there

C:\Temp\Wrapper>svn info AA
Sökväg: AA
URL: https://x.y.z/svn/test/A/AA
Arkivrot: https://x.y.z/svn/test
...

C:\Temp\Wrapper>svn info BB
Sökväg: BB
URL: https://x.y.z/svn/test/B/BB
Arkivrot: https://x.y.z/svn/test
...

// Commit both folders in a single commit

C:\Temp\Wrapper>svn ci AA BB --username micke -m "Task: test multiple
path ci with command line client"
Autentiseringsregion (realm): <https://x.y.z:443> Subversion repository
Lösenord för "micke": ***********
Skickar AA\FILE-A.TXT
Skickar BB\FILE-B.TXT
Skickar filinnehåll ..
Arkiverade revision 7.

// Log seems to indicate success

C:\Temp\Wrapper>svn log https://x.y.z/svn/test -r7 -v
------------------------------------------------------------------------
r7 | micke | 2007-05-04 22:18:32 +0200 (fr, 04 maj 2007) | 1 line
Ändrade sökvägar:
   M /A/AA/FILE-A.TXT
   M /B/BB/FILE-B.TXT

Task: test multiple path ci with command line client
------------------------------------------------------------------------

HTH,
/Micke

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 4 22:34:36 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.