Re: Using tags to manage releases?

2011-06-01 Thread Ole Pinto
2011/6/1 Thorsten Schöning 

> ...
> Therefore I would prefer proper proper merging by the developer,
> because you get a useful diff and log message in the changed file for
> QA.
>

At least, the merging could automatically be done on the server: when
getting the commit, take note of the revision being generated, and maybe
launch a task to do:

svn co /release/ (unless it already exists, in which case, a
svn update would suffice)
svn merge --non-interactive .../trunk -c
Check for conflicts (maybe "svn st | grep "^ *C"); if there are, mail the
developer asking to merge manually.
If not, svn ci -m "Merged from trunk::"

Be careful to run those tasks in order...


Fwd: hi, need help with svn command checkout

2011-05-23 Thread Ole Pinto
Of course, have a thorough "make clean" target, and run it before
rebuilding. If necessary, run "svn st" and check that no unversioned files
remain (considering possible svn:ignore's you might have).


On Mon, May 23, 2011 at 01:10, Ryan Schmidt  wrote:

>
> On May 22, 2011, at 14:36, Elad A wrote:
>
> > i build a system that store revision id when a branch is ready for QA.
> > the developer use "ready to qa" string in his comment when commit.
> > there is a post commit script that collect the revision and insert it to
> a DB.
> >
> > the QA goes to a web page that populate the "ready to QA" projects.
> > after the QA choose the project he wants to check, the web page generate
> install_rev.bat file for the QA to run on his machine.
> >
> > until this point everything is working like it should.
> >
> > my question is whats the command that should be in install_rev.bat file?
> >
> > i want that the QA will start from fresh. for example if now the QA
> checks for a project "mobile" revision 1000.
> > and he wants to check after that "mobile" revision 900.
> >
> > the environment should be clean from revision 1000 files and folders and
> should have only 900 files and folders.
> >
> > whats the command i should use?
> > i cant delete the folder, fresh chcekout takes about 20 minutes.
>
> Assuming the QA person has not made any changes in the working copy (that
> is, "svn status" returns nothing), then they can simply run "svn up -r 900".
>
>
>
>


Re: Sync SVN to CVS

2011-03-31 Thread Ole Pinto
If all they do is "update" to the trunk's latest revision, it could be done
taking checking out the SVN source and committing it into SVN. Care should
be taken with added/deleted files; I think there was an easy way using
¿external branches? (like 1.0.1.1).

If you need releases / tags, it only gets a bit more difficult as long as
you use releases as tags (i.e., only the copy from trunk, and no more
commits).

On Wed, Mar 30, 2011 at 19:42, SUMNER Andrew
wrote:

> Our operations group require that the database scripts are in cvs, however
> the developers are using svn for everything else and it would prefer to be
> using the one tool.
>
> My eventual goal being continuous deployment into test using Jenkins (also
> would love to hear from anyone who has done this for database changes...)
>
> Andrew
>
> -Original Message-
> From: Thorsten Schöning [mailto:tschoen...@am-soft.de]
> Sent: Wednesday, 30 March 2011 20:34
> To: users@subversion.apache.org
> Subject: Re: Sync SVN to CVS
>
> Guten Tag SUMNER Andrew,
> am Dienstag, 29. März 2011 um 21:56 schrieben Sie:
>
> > 1.   Are there any tools to sync SVN to CVS?  Ideally I would like
> > two way sync but I may be able to get away with one way (svn -> cvs)
> > especially if it can throw an error if the cvs file has changed.
> [...]
> > The repository I wish to sync contains database script files.
>
> And what's the purpose you need the sync for or what problem do you
> need to solve? It's unlikely that you find a tool which syncs as you
> need, but maybe one has another idea on how to solve your problem.
>
> Mit freundlichen Grüßen,
>
> Thorsten Schöning
>
> --
> Thorsten Schöning
> AM-SoFT IT-Systeme - Hameln | Potsdam | Leipzig
>
> Telefon: Potsdam: 0331-743881-0
> E-Mail:  tschoen...@am-soft.de
> Web: http://www.am-soft.de
>
> AM-SoFT GmbH IT-Systeme, Konsumhof 1-5, 14482 Potsdam
> Amtsgericht Potsdam HRB 21278 P, Geschäftsführer: Andreas Muchow
>
> The information contained in this e-mail may be privileged and/or
> sensitive. It is intended for the addressee only and is not necessarily the
> official view or communication of the New Zealand Customs Service. If you
> are not the intended recipient you are asked to not disclose, copy, or make
> use of its contents. If received in error you are asked to destroy this
> e-mail and contact the sender immediately. Your assistance is appreciated.
>


Re: SVN: "Out of memory" when committing

2011-03-25 Thread Ole Pinto
Still happens with 1.6.16. Am I the only one? Any idea, at least, of what is
causing this behaviour?

On Wed, Feb 23, 2011 at 10:07, Ole Pinto  wrote:

> Hello, I've just began in a new job and, due to the repo organization, I've
> found a problem I didn't have before. I'm using the command line version of
> svn:
> svn, version 1.6.15 (SlikSvn/1.6.15) WIN32
>compiled Dec 17 2010, 14:03:07
>
> I am getting the "Out of memory - terminating application" message when
> checking in, without any regard to size of working copy or changes.
>
> I have got to the point of knowing what cause it; the repo goes kind of:
> /
> ├──j
> │  ├──1
> │  │  ├──release
> │  │  └──trunk
> │  ├──2
> │  └──3
> └──l
>├──l1
>│  ├──release
>│  ├──trunk
>│  ├──v5
>│  └──v6
>├──l2
>└──l3
>
> I have a local copy of some of it, with the same structure (beginning at
> root), for example:
> C:\repo
> ├──j
> │  └──1
> │ └──trunk
> └──l
>└──l1
>   └──trunk
>
> Now I want to make big changes to l/l1, so I "cd /repo/l/l1; svn co
> .../repo/l/l1/trunk my_trunk", change whatever, cd into my_trunk, and the
> checkin will fail as described.
>
> Workarounds:
>1) put aside trunk, rename my_trunk to trunk and check in
>2) move my_trunk out of the local repository (ie. into /tmp/my_trunk)
> and commit that.
>
> Related, AFAICS, to issue 
> 3540<http://subversion.tigris.org/issues/show_bug.cgi?id=3540>.
> I'd say it's a P2 more than a P3, as I have found it every time I have
> committed.
>
> Any easier way? Changing the repo is not an option, but some change in how
> i keep the working copy could be possible...
>
> Regards,
>  Óscar
>


Re: "svn log" not showing all the changes?

2011-03-17 Thread Ole Pinto
When you commit a file, that file is updated to the new revision. But only
that file. And, when you "svn log", you get the information as it was in
your BASE revision (that is, what sfn info shows).
So I guess you haven't done a svn update in your root directory, and still
are in the 37547 revision. Do try it and tell us what happens...

On Thu, Mar 17, 2011 at 17:01, Ben Hsu  wrote:

> Hello
>
> I am seeing some unexpected behavior when I use "svn log", it does not list
> all the changes which have been made to the repository.
>
> When I do a svn log on the directory, the most recent change was a few
> weeks ago:
>
> ~/dev/productmanager/trunk]$  svn log
> src/main/java/com/bluefly/apps/manager/webapp/controller/po | head
> 
> r37547 | bhsu | 2011-02-28 11:15:27 -0500 (Mon, 28 Feb 2011) | 2 lines
>
> This shows the last change made to the repository was on Tuesday
>
> But when I do a svn log on the file I checked in recently, it shows a more
> recent change:
>
> ~/dev/productmanager/trunk]$ svn log
> src/main/java/com/bluefly/apps/manager/webapp/controller/po/ExcelUploadController.java
> |head
> 
> r37966 | bhsu | 2011-03-16 15:27:43 -0400 (Wed, 16 Mar 2011) | 2 lines
>
> Has anybody seen this before?
>
> My svn version # is svn, version 1.4.2 (r22196)
>
> Thank you!
>


Re: Using svn with cron?

2011-03-07 Thread Ole Pinto
As you are scheduling your job to run with your user, I don't think it is a
permissions related problem. But maybe the env. vars do matter, including
any needed to get to your stored password.

Once you get to stderr you'll probably have a clue about what is happening.
If not, from your perl script print the environment vars, and reproduce that
in an interactive shell. If it doesn't work, there you have it. Now you
would only need to compare this to a "normal" shell, and make small
modifications until you make it work.

On Sun, Mar 6, 2011 at 20:45, bimininavels  wrote:

> I've been struggling all morning with what should be a very simple problem.
>
> I would like to commit and update a svn repository daily using cron. I've
> encapsulated my svn calls into a perl script, which runs the following
>
> 
> #!/usr/bin/perl
>
> print "To run svn commit\n";
> $thetime=time;
>
> system "cd ~/docs; /usr/bin/svn commit --message '$thetime' \n";
> system "cd ~/docs; /usr/bin/svn info \n";
> 
>
> The whole thing is >> to a file in my /tmp directory for monitoring.
>
> The script works fine if I run it manually.
>
> In the monitoring file, I see the correct output from svn info after the
> cronjob, but it looks like the "svn commit" never runs. I don't see any
> output
> from it and the revision never changes.
>
> 
> To run svn commit
> Path: .
> URL: svn://xxremoved
> Repository Root: svn://xxremoved
> Repository UUID: xxremoved
> Revision: 487
> Node Kind: directory
> Schedule: normal
> Last Changed Rev: 487
> Last Changed Date: 2011-03-06 04:42:01 -0800 (Sun, 06 Mar 2011)
> 
>
> (I do have some file changes there to force a commit)
>
> Does anyone know why svn info would work while svn commit would not?
>
> Thanks,
> - Jonathan
>


SVN: "Out of memory" when committing

2011-02-23 Thread Ole Pinto
Hello, I've just began in a new job and, due to the repo organization, I've
found a problem I didn't have before. I'm using the command line version of
svn:
svn, version 1.6.15 (SlikSvn/1.6.15) WIN32
   compiled Dec 17 2010, 14:03:07

I am getting the "Out of memory - terminating application" message when
checking in, without any regard to size of working copy or changes.

I have got to the point of knowing what cause it; the repo goes kind of:
/
├──j
│  ├──1
│  │  ├──release
│  │  └──trunk
│  ├──2
│  └──3
└──l
   ├──l1
   │  ├──release
   │  ├──trunk
   │  ├──v5
   │  └──v6
   ├──l2
   └──l3

I have a local copy of some of it, with the same structure (beginning at
root), for example:
C:\repo
├──j
│  └──1
│ └──trunk
└──l
   └──l1
  └──trunk

Now I want to make big changes to l/l1, so I "cd /repo/l/l1; svn co
.../repo/l/l1/trunk my_trunk", change whatever, cd into my_trunk, and the
checkin will fail as described.

Workarounds:
   1) put aside trunk, rename my_trunk to trunk and check in
   2) move my_trunk out of the local repository (ie. into /tmp/my_trunk) and
commit that.

Related, AFAICS, to issue
3540.
I'd say it's a P2 more than a P3, as I have found it every time I have
committed.

Any easier way? Changing the repo is not an option, but some change in how i
keep the working copy could be possible...

Regards,
 Óscar