> -Original Message-
> From: Daniel Shahaf [mailto:d...@daniel.shahaf.name]
> Sent: woensdag 10 oktober 2012 03:49
> To: David Aldrich
> Cc: 'users@subversion.apache.org' (users@subversion.apache.org)
> Subject: Re: Help needed: 'History scheduled with
That's 1.7, isn't it? Have you tried just committing? If you commit
using the cmdline client you'll get a second list of files in the editor
window, and even if you don't you can always revert the commit (via
reverse merge) or test by committing the merge to a newly-created
temporary branch.
Dav
Hi
We have just merged a branch into the trunk (reintegration), but have not
committed the merge because some files are marked as 'History scheduled with
commit'. We don't know what to do about these.
A new folder was added to the branch. That folder is marked 'Added' in the
merge, but the f
