On Wed, Aug 25, 2010 at 05:00:09PM +0100, Julian Foad wrote:
> On Tue, 2010-08-24, Julian Foad wrote:
> [...]
> > What should happen?
> > ---
> >
> > I think the required changes are:
> >
> > * Commit should unconditionally bail out if there are any conflicts
> > inside a node bei
I can now clarify the desired behaviour, and explain why "--keep-local"
shouldn't make any difference. Resolving a conflict is supposed to be a
two step process for the user:
1. Choose the desired WC state - e.g. use "svn delete" or something
else.
2. Tell Subversion it's resolved - use "svn
I'm looking at the tree_conflict_tests.py 17 failure in single-DB.
FAIL: tree_conflict_tests.py 17: --keep-local del on dir with TCs
inside
Neels, you might be able to shed some light on this.
What's the test for?
The test says: if you have a directory with tree conflict
Temp function. It can be used in entries.c, too.
It'll only last until single-db.
Not blasting conflict info is good, in case of reverts.
On May 12, 2010 2:17 PM, "Philip Martin" wrote:
The only thing keeping me from finally removing svn_wc_entry_t from
harvest_committables is keep_local. The
The only thing keeping me from finally removing svn_wc_entry_t from
harvest_committables is keep_local. There was some discussion on IRC
a few days ago
http://colabti.org/irclogger/irclogger_log/svn-dev?date=2010-05-06#l44
but it really resolve things. It includes pointers to Neels patch to
make
5 matches
Mail list logo
