Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: neutral (athena.apache.org: local policy)
From: "Bert Huijben" <bert@qqmail.nl>
To: "'Daniel Shahaf'" <d.s@daniel.shahaf.name>,
	"'David Aldrich'" <David.Aldrich@EMEA.NEC.COM>
Cc: <users@subversion.apache.org>
References: <41302A7145AC054FA7A96CFD03835A0A1A16A7@EX10MBX02.EU.NEC.COM>
 <20121010014915.GG3927@lp-shahaf.local>
In-Reply-To: <20121010014915.GG3927@lp-shahaf.local>
Subject: RE: Help needed: 'History scheduled with commit'
Date: Wed, 10 Oct 2012 11:54:34 +0200
Message-ID: <00d601cda6cd$41448b10$c3cda130$@qqmail.nl>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
Thread-Index: AQFsSkI4mK2I6TUJSbuTyXRas7psLwKkwtPamF/eJKA=
Content-Language: nl


> -----Original Message-----
> From: Daniel Shahaf [mailto:d.s@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 commit'
> 
> 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.

Committing an copy of a directory includes all the files inside. Before
Subversion 1.7 merges would have reported all the files individually added,
while it only committed the copy of the parent directory. We fixed this
issue when switching to the new working copy backend.

The result in the repository will be identical to what it was before 1.7,
but status explains better what really happens. And now it can also report
'M +' when the file is scheduled to be added via its parent, but is itself
modified.

	Bert