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

Re: merging into locally added files

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 4 Aug 2010 11:36:38 -0400

On Wed, Aug 4, 2010 at 10:29 AM, Stefan Sperling <stsp_at_elego.de> wrote:

> I haven't run make check yet either, in fear that lots of merge
> tests will just start to fail on me when I try.

I forget to mention in my earlier response, I ran [ra_serf] x
[merge_tests.py | merge_reintegrate_tests.py |
merge_tree_conflict_tests.py] with your patch applied and everything
passed.

Paul
Received on 2010-08-04 17:37:14 CEST

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