On Tue, Oct 02, 2012 at 09:35:19AM +0200, Ulrich Eckhardt wrote:
> Am 01.10.2012 21:07, schrieb chroyer:
> >I was wondering if the following scenario makes sense, or if this is
> >asking for problems.
> >
> > * I am regularly merging differences between 2 trees (I won't go in
> >too much details here...those tree are not really under my control; I
> >put those them in the tags area, and I want to merge the changes between
> >2 consecutive such snapshots. In my case, I can not just use a branch
> >and update it with the latest version - the tree gets modifications
> >before being tagged).
>
> It's unfortunate that you don't want to go into details here.
Indeed. In addition to explaining your intentions and problem, which
you've done very well, please show us the commands you're using to
implement your approach. Having to guess what you're actually doing
makes giving advice over email harder.
> > * to merge the differences between 2 snapshots, I am using
> >--ignore-ancestry (otherwise I see a lot of files being "replaced").
Please show us all svn commands you're running, starting from "putting
snapshots into the tags area" up to "I see a lot files being replaced".
It may well be that a simple tweak to your command sequence could
fix problems with replacements and the like.
It's usually best to provide a list of commands (a working shell script
is even better) that starts off with an empty repository and ends with
the command where you're running into a problem. This way, others can
try to reproduce the problem and figure out a solution.
Received on 2012-10-02 13:44:39 CEST