Re: svn merge failure with added executable files?

[kf...@collab.net]

Josh Pieper <jp...@andrew.cmu.edu> writes:
> I think it can be reproduced by making a simple repository with a
> branch.  Add an executable file to the trunk.  Then attempt to merge
> this change into the branch.

Can you write a script that does this?  Concrete examples (as opposed
to descriptions of examples) are ten times easier to reproduce :-).

Thanks,
-Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn merge failure with added executable files?

[kf...@collab.net]

Josh Pieper <jp...@andrew.cmu.edu> writes:
> Attached is the script.  The bug seems to only be triggered when the
> --dry-run option is given to merge.  This is actually a better
> workaround than the one I gave previously... don't try a dry-run
> first.

Attached to issue #1468, thank you!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn merge failure with added executable files?

[Josh Pieper <jp...@andrew.cmu.edu>]

> > I think it can be reproduced by making a simple repository with a
> > branch.  Add an executable file to the trunk.  Then attempt to merge
> > this change into the branch.
> 
> Can you write a script that does this?  Concrete examples (as opposed
> to descriptions of examples) are ten times easier to reproduce :-).

Attached is the script.  The bug seems to only be triggered when the
--dry-run option is given to merge.  This is actually a better
workaround than the one I gave previously... don't try a dry-run
first.

-Josh

-- 
Beware of low-flying butterflies.