[Svnmerge] problems with added files
dlr at collab.net
Thu Jan 4 13:29:47 PST 2007
On Wed, 20 Dec 2006, Blair Zajac wrote:
> Jack Repenning wrote:
> > On Dec 20, 2006, at 7:30 AM, Konstantin Sobolev wrote:
> >> A thousand apologies! I somehow had that files as unversioned files in
> >> by branch WC. I don't know if it is possible, but a warning in such
> >> cases would would be great.
> > If you're merging over a versioned file that collides with an
> > unversioned file in the receiving working copy, you _should_ get an
> > error, shouldn't you? You certainly do if you update and run into
> > the same situation.
> svnmerge.py doesn't check for any unversioned files in the working
> copy, and I think it should do that. It should only allow the
> svnmerge-commit-message.txt to exist in the directory.
I think we could detect this info via the same 'svn status' call used
to scan the WC for local mods. A warning might be better than a hard
error for this case, however.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: not available
More information about the Svnmerge