hi,
I wanted to test how tla/arch handles conflicts, so I modified the same
file in two checkouts.
After running update --in-place to be able to commit from the second
checkout, two file was renamed to file.orig with the conflicting changes
in file.rej.
I merged in the changes by hand in file.orig, then make-log + commit. I
forgot to rename file.orig to just file, so arch (using the names
method) recorded the file as deleted. I then updated my first checkout,
causing file to be deleted there as well.
I noticed this and went back and renamed file.org -> file, then
comitted, expecting that the file would show up in the first checkout at
next update. However, now I get:
$ tla what-changed --diffs
what-changed: no local copies to compare to
(jg@xxxxxxxxxxxx/code--mainline--0.1--patch-5)
consider `add-prisitine --help'
I am sure that this is simple, but could some please explain to me what
I am doing wrong and what is now expected from me?
Thanks,
Jacob
|