Re: copy-merge in Subversion?

2010-08-18 Thread Erik Andersson
On Thu, Aug 19, 2010 at 8:27 AM, Cooke, Mark wrote: > > -Original Message- > > From: Lezz Giles [mailto:lgi...@tripadvisor.com] > > Sent: 18 August 2010 18:14 > > To: Ryan Schmidt > > Cc: users@subversion.apache.org > > Subject: Re: copy-merge in Subversion? > > > > On Aug 18, 2010, at 11

Post commit script examples?

2010-08-18 Thread Greg Alexander
Hello, I am a very new Subversion user and am trying to get a post commit hook script working. My Subversion is running on linux. The script I want to add would add the needs-lock property to every file that didn't have a lock. Any pointers on this would be great. I have searched and not fou

RE: copy-merge in Subversion?

2010-08-18 Thread Cooke, Mark
> -Original Message- > From: Lezz Giles [mailto:lgi...@tripadvisor.com] > Sent: 18 August 2010 18:14 > To: Ryan Schmidt > Cc: users@subversion.apache.org > Subject: Re: copy-merge in Subversion? > > On Aug 18, 2010, at 11:24 AM, Ryan Schmidt wrote: > > On Aug 18, 2010, at 07:47, Le

Re: backing up a subversion repo via amanda backup

2010-08-18 Thread Nico Kadel-Garcia
On Wed, Aug 18, 2010 at 2:21 PM, Christopher McCrory wrote: > Hello... > >   I wrote up a short perl program to backup a subversion repository via > amanda ( http://www.amanda.org ).  Basically it uses the amanda > application API to call 'svnadmin dump'.  It still needs a few > enhancements, but

backing up a subversion repo via amanda backup

2010-08-18 Thread Christopher McCrory
Hello... I wrote up a short perl program to backup a subversion repository via amanda ( http://www.amanda.org ). Basically it uses the amanda application API to call 'svnadmin dump'. It still needs a few enhancements, but it does work. I developed it on Fedora 13 where it should "just work".

What storage solution is the best

2010-08-18 Thread Tami Doyen
We are replicating large amounts of data along with multi-Gig file sizes on Subversion 1.6.11 to many countries including India. What would be the best storage solution to have Subversion on, DAS vs SAN, vs NAS? Tami Doyen PMC-Sierra

Re: Restore all trunk!

2010-08-18 Thread Steven Koch
Resolved! thnks for all!!! Your answer very usefuly!!! I flow: 'svn merge -r 3256:3255 svn://svn.mylocation/repositoryName/trunk' svn commit -m 'merge 3256:3255' Until I reached 3243!!! Thnks! Steven Koch 2010/8/18 Giulio Troccoli > > > We have two servers(stagging and production), one

Re: copy-merge in Subversion?

2010-08-18 Thread Lezz Giles
On Aug 18, 2010, at 11:24 AM, Ryan Schmidt wrote: > > On Aug 18, 2010, at 07:47, Lezz Giles wrote: > >> Imagine the following scenario: >> >> - trunk has several large files (> 20M) which are updated regularly. These >> files are +only+ changed on trunk. >> - there are several branches, each

Re: Restore all trunk!

2010-08-18 Thread Les Mikesell
On 8/18/2010 8:07 AM, Steven Koch wrote: Hi, I need update the servers, and continue send changes to the point 3243! but actual content of SVN server are different (now r3251 is considered new files, same that they are equals files) If you deleted the trunk and then committed new copies of the

Re: copy-merge in Subversion?

2010-08-18 Thread Ryan Schmidt
On Aug 18, 2010, at 07:47, Lezz Giles wrote: > Imagine the following scenario: > > - trunk has several large files (> 20M) which are updated regularly. These > files are +only+ changed on trunk. > - there are several branches, each of which updates from trunk at least once > a week. > > The

RE: Restore all trunk!

2010-08-18 Thread Giulio Troccoli
> > We have two servers(stagging and production), one > development machine > > and one repository SVN server separated. Do you mean to say that the staging and production machines have a working copy of the same SVN repository? > > > If you have reverse-merge the offending revisions than > your

Re: Restore all trunk!

2010-08-18 Thread Erik Andersson
Hi You're not really making sense, but I would recommend that you leave your working copy alone for now. Make a new checkout that will get you latest in trunk. Merge back to the revision you wanted and commit.. Now you should be back where you were before you messed up. Then ask us for help on w

Re: Restore all trunk!

2010-08-18 Thread Steven Koch
But I know'n making it!! :( On Aug 18, 2:07 pm, Steven Koch wrote: > Hi, > > I need update the servers, and continue send changes to the point > 3243! but actual content of SVN server are different (now r3251 is > considered new files, same that they are equals files) > > We have two servers(sta

Re: Restore all trunk!

2010-08-18 Thread Steven Koch
Hi, I need update the servers, and continue send changes to the point 3243! but actual content of SVN server are different (now r3251 is considered new files, same that they are equals files) We have two servers(stagging and production), one development machine and one repository SVN server sepa

copy-merge in Subversion?

2010-08-18 Thread Lezz Giles
Imagine the following scenario: - trunk has several large files (> 20M) which are updated regularly. These files are +only+ changed on trunk. - there are several branches, each of which updates from trunk at least once a week. The merge of the large files from trunk takes an excessive amount o

RE: Restore all trunk!

2010-08-18 Thread Giulio Troccoli
> Thnks > > > But, I can rolback the revision on my working copy (NOW my > working copy are 3243, and the SVN 3251), but not can commit > this 'rollback' > to trunk! because this revision already exists on SVN Server If you have reverse-merge the offending revisions than your working copy is at r

Re: Restore all trunk!

2010-08-18 Thread Steven Koch
Thnks But, I can rolback the revision on my working copy (NOW my working copy are 3243, and the SVN 3251), but not can commit this 'rollback' to trunk! because this revision already exists on SVN Server This causing that the servers cannot update your files, because same files already exists and

Re: Restore all trunk!

2010-08-18 Thread Konstantin Kolinko
2010/8/18 Steven Koch : > Hi > > I'm in a dirt, and would like a help! > > I will describe the workflow of the donkey: > > - Copy the contents of a local branch to another folder and removed > all references .svn this folder. > - And later removed the contents of the trunk location, via "svn rm" >

RE: Restore all trunk!

2010-08-18 Thread Giulio Troccoli
> Hi > > I'm in a dirt, and would like a help! > > I will describe the workflow of the donkey: > > - Copy the contents of a local branch to another folder and > removed all references .svn this folder. > - And later removed the contents of the trunk location, via "svn rm" > and submitted via commit

Restore all trunk!

2010-08-18 Thread Steven Koch
Hi I'm in a dirt, and would like a help! I will describe the workflow of the donkey: - Copy the contents of a local branch to another folder and removed all references .svn this folder. - And later removed the contents of the trunk location, via "svn rm" and submitted via commit this change. - C

Re: Tree conflicts when merging multiple revisions

2010-08-18 Thread Stefan Sperling
On Wed, Aug 18, 2010 at 11:38:28AM +0100, emerson wrote: > I'm trying to run a merge with different revisions. We use a two tier > codebase approach with trunk and a stable branch and selectively > cherry-pick what should be merged. This is a rather vague description of what you are doing. If you

Tree conflicts when merging multiple revisions

2010-08-18 Thread emerson
I'm trying to run a merge with different revisions. We use a two tier codebase approach with trunk and a stable branch and selectively cherry-pick what should be merged. After merging a few revisions, I have a "Summary of conflicts: Tree conflicts: 2" message. How can I find out which the revisio