Hi all
Using r3373.
I just attempted to merge changes from a features branch into the trunk. This is not something I do so often, so the following could be user error - I was following the manual's steps, though, as I did it. Anyway...
Right-clicked on an updated WC of trunk, selected Merge...
I picked the trunk as the From: url, and revision 97 (which is when I last synced).
I picked branches/pete as the To: url, and revision 141 (which is the HEAD of branches/pete).
I hit merge. I reviewed what had happened. Some adds, some conflicts.
Some of the changes introduced by the merge were new forms, and thus new files. When I went to commit, on the trunk, I noticed that none of these new files are under version control.
Why's that? I would have expected them to be added automatically - or are they by design not added? They were added to the trunk WC by the merge operation, so I would have thought they should get added automatically...
Confused.
I'll get the latest nightly when there is one to download...
Regards
Pete
Received on Fri May 20 17:57:43 2005