Re: 'svn merge' vs. diff/patch

On 12/07/04 kfogel@collab.net wrote:
> Ben Collins-Sussman <sussman@collab.net> writes:
> > # check out a branch wc
> > svn co svn://svn.myrealbox.com/source/branches/mono-1-0/mono/mono/mini
> >
> > # examine the patch on trunk (this shows a tiny addition to 'ChangeLog')
> > svn diff -r37302:37303
> > svn://svn.myrealbox.com/source/trunk/mono/mono/mini
[...]
> > # now apply the same patch to the wc:
> > svn merge -r37302:37303
> > svn://svn.myrealbox.com/source/trunk/mono/mono/mini
> >
> > ... the merge results in a huge conflict within 'ChangeLog', rather
> > than just a tiny 3-line addition as 'svn diff' predicted.
>
> With SVN trunk r12206, I don't get a huge conflict. I get this at the
> top of ChangeLog:
>
> <<<<<<< .working
> =======
>
> Tue Dec 7 10:06:39 CET 2004 Paolo Molaro <lupus@ximian.com>
>
> * exceptions-ppc.c: avoid calling ppc_patch in exception \
> trampolines.
>
> 2004-12-01 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>
> >>>>>>> .merge-right.r37303

The state of the repository has changed, since the patch has been committed
to the branch (using diff & patch). If you do the initial checkout
at a revision where the patch was not in the branch you'll get the same
huge conflict. Try, as the first step:
        svn co -r 37330 svn://svn.myrealbox.com/source/branches/mono-1-0/mono/mono/mini
and then do the same merge. This gets the wc in mostly the same state as
when the issue was noticed.
The start of the Changelog file should look like:

== cut cut ==
<<<<<<< .working
=======

Tue Dec 7 10:06:39 CET 2004 Paolo Molaro <lupus@ximian.com>

        * exceptions-ppc.c: avoid calling ppc_patch in exception trampolines.

2004-12-01 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>

        * inssel-s390.brgi, mini-ops.h, mini-s390.c : Add stubs for support of tls offset
        support.

2004-12-06 Zoltan Varga <vargaz@freemail.hu>

        * mini-sparc.c: Zero out localled-ed memory.

        * iltests.il: Add tests for zeroing out localloc-ed memory.

2004-12-04 Martin Baulig <martin@ximian.com>

        * mini.c (mono_method_to_ir): In CEE_CALLVIRT, use the new
        mono_method_get_signature_full().

2004-12-03 Massimiliano Mantione <massi@ximian.com>

        * mini.c: Added removal of critical edges (prerequisite for SSAPRE),
        and some utility functions (always for SSAPRE), integrated SSAPRE.
        * mini.h: Likewise.
        * driver.c: Added ssapre option.
        * ssa.c: Small fix on OP_ARG handling.
        * ssapre.c, ssapre.h: Added files containing SSAPRE implementation.
        * Makefile.am: Likewise.

2004-12-02 Zoltan Varga <vargaz@freemail.hu>

        * tramp-x86.c (mono_arch_create_jit_trampoline): Remove code which is
        now in the xp code.

        * mini.c (mini_init): Register mono_thread_force_interruption_checkpoint
        icall.

2004-12-01 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>

        * inssel-s390.brg : Add OP_OUTARG_VT (OP_REFANYTYPE (reg)) rule.
        
        * cpu-s390.md : Increase instruction length of oparglist.

        * mini-s390.c : Implement vararg and TYPEDEBYREF support.

2004-11-30 Martin Baulig <martin@ximian.com>

        * mini.c (mono_method_to_ir): In CEE_CALLVIRT, added support for
        virtual generic methods. We call a special helper_compile_generic_method()
        icall to retrieve the method from the vtable, inflate and compile
        it and then do a CEE_CALLI. Thanks a lot to Paolo for this idea.

        * jit-icalls.c (helper_compile_generic_method): New JIT icall.

2004-11-30 Zoltan Varga <vargaz@freemail.hu>

        * mini-sparc.c: Fix up vararg corner cases. Fixes #70019.

>>>>>>> .merge-right.r37303
2004-11-29 Zoltan Varga <vargaz@freemail.hu>
== cut cut ==

Note the 60 line conflict instead of the 4 lines one.

> Can you say exactly what you saw, that caused you to describe a "huge
> conflict"?

See above. The merge included a lot of stuff that was not in the
merged revision.

lupus

-- 
-----------------------------------------------------------------
lupus@debian.org                                     debian/rules
lupus@ximian.com                             Monkeys do it better
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org