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.
David Aldrich wrote on Tue, Oct 09, 2012 at 08:20:19 +0000:
> 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 files that it contained are marked 'History scheduled with commit' and do not appear in the list of files that will be added.
>
> svn stat output:
>
> A + - 4754 ? folder1
> + - 4754 ? folder1\folder2
> + - 4201 username folder1\ folder2\file1
> + - 4201 username folder1\ folder2\file2
>
> I want the folder AND its contents to be merged into the trunk.
>
> How do I fix this please?
>
> Best regards
>
> David
>
Received on 2012-10-10 03:49:58 CEST