Re: Merge issue with deleted files

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Cristian wrote:
> Thanks for your reply Mark.
[...]
>> The way I understand it, it's as if you were to look at the diff from
>> revision <first "j" argument> to revision <second "j" argument>, and
>> apply that to what's in your checkout.

That is precisely how it works.

> Instinctively I would have thought that would be a conflict.
You need to retrain your instincts :-)

As Mark pointed out, the difference between the two versions was "remove
the file." The difference - "remove the file" - was then applied to the
working directory. There is no conflict to report.

In your original message you wrote:

> There is a message been spit out by CVS 'file XX has been modified,
> but has been removed in revision B1'

I think what you have really learned is: warnings are issued for a
reason. Pay attention to them!

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkr069wACgkQLdDyDwyJw+NY7wCeM4NB3IYzHu7eZf4HxJ/LHdp8
db4An3RKr1u2Bzuy0uoykaJS9hKE0wmA
=ww3O
-----END PGP SIGNATURE-----