[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug merging feature branch to trunk with --dry-run and added directories?

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-03-04 16:13:09 CET

Hi. We've been using Subversion in our company for a couple weeks now.
It's great, thanks.

One of our developers just finished working on a feature branch (only
our second ever) and wanted to merge it back to trunk.

We encountered a problem, which is roughly like this:

- In the feature branch, directories were created, and files were
created inside those directories.

- When merging the feature branch changes back into a working copy of
trunk, we wanted to make sure we knew what we were getting, so we ran
the merge with --dry-run.

- The dry run obviously did not modify the working copy, and in
particular, it did not create the new directories that were added in
the feature branch.

- The merge then complained when trying to process the files inside the
new directories, we think because the directory didn't exist in the
working copy. Something about "skipped missing target."

Does this sound like a known problem? I checked the issue tracker, and
the only occurrence of "dry" in the bug titles seems to be issue 795
which isn't related.

If this is not yet known, I'll be happy to put together a transcript to
reproduce it.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 4 16:18:03 2005

This is an archived mail posted to the Subversion Users mailing list.