Re: merging suddenly doesn't work

On 13.05.06 18:08:49, Blair Zajac wrote:
> On May 12, 2006, at 10:13 AM, Andreas Pakulat wrote:
> >I've got another question regarding svn_load_dirs: Can I somehow use
> >that program to import the svn-checkout of upstream? I can of course
> >strip the svn-dirs, however then I won't get the svn properties either.
> >So is there a way to preserve the properties when using svn_load_dirs,
> >or is there maybe another way to keep track of upstream in my own
> >repository?
>
> svn_load_dirs.pl will not track the properties for you.

Hmm, too bad :-( I'll have to write a small script for that (it's only
svn:ignore anyway).

> BTW, I believe that the merge failed in this case because it doesn't support
> adding files that are copies of other files in the remote repository.

I didn't check what happened between the mentioned revisions in
aqbanking svn, but I don't think there were copies of files...

Andreas

-- 
Your life would be very empty if you had nothing to regret.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org