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

Re: How to delete all unmodified files between 2 revisions on a patch branch?

From: AfterShock <mikkey_at_gmail.com>
Date: Sat, 27 Dec 2008 09:22:23 -0800 (PST)

Yes, I want to create a zip file for users to install as a patch. But we
don't want to release the patch just yet. There are certain files and
changes in the HEAD trunk which are unfinished features which need removing
from the patch. Ideally I would like the whole team to be able to remove
their unfinished features from the patch branch themselves. With the system
you propose, I would have to do this myself by removing the local files
manually from the exported folder.

I guess you could perhaps argue that each feature should be on it's own
branch until it's definitely ready for inclusion, making trimming unfinished
features at patch-time very easy. But this would make testing very hard as
all my team want to be working on the same checkout, as we test many
different features at the same time - we wouldnt want to be switching from
branch to branch to test each feature.

I would also like a history of any files added / deleted to the patch, which
is not possible if I am simply modifiying an unversioned local folder made
from the exported modified files.

Ideally I would like to have a "release candidate" branch which contains the
contents of the patch zip file for testing. My team would then check this
branch out, copy all the files over to a "Current release (2.1)" folder and
see if everything works ok, and can add / remove files.

In short, I'd like all my team to have read / write access to the patch zip
file while it is under construction.

Does this mean I should create a branch, create a local export of all the
changed files, and then SVN delete every file from the branch which is not
on that list. Are there any better methods or am I missing something still?

Thank,
Mike

Stefan Kueng wrote:
>
> AfterShock wrote:
>> Hi Stefan,
>>
>> Thanks for your reply. Am I right in saying that this exports the changed
>> files to a local folder but does not create a branch? So then i must
>> create
>> a new branch and add all these files to it, right? Can I then merge any
>> future changes from the trunk across to this branch?
>
> * no, this does not create a branch but only saves all the listed files
> to a local folder.
> * remember, creating a branch is cheap, it does not require any space in
> the repository (ok, not nothing, but only a few bytes).
> * if you create a new folder an add these files manually to it, then you
> won't be able to merge future changes there. That's because you don't
> actually create a branch (i.e., a copy from e.g. trunk) but you create
> a new folder without history information.
>
> I'm guessing you want to provide a small zip file for your users to
> apply a 'patch' which contains all the new files. So why not create a
> public folder where you just drop in the zipped files, named e.g. "patch
> x.x.x" ?
> You can then create real branches (actually, in your case that would be
> called a tag) and compare those as I mentioned before so you can get the
> changed files, zip them and upload them somewhere.
>
> Stefan
>
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=993758
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].
>
>

-- 
View this message in context: http://www.nabble.com/How-to-delete-all-unmodified-files-between-2-revisions-on-a-patch-branch--tp21184310p21185850.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=993798
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-27 18:22:53 CET

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

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