Hi!
I tried to merge from Matthieus xtla--main--0.9 branch.
Here is the content from the *tla-missing* buffer:
*** Bookmark xtla-xsteve ([EMAIL PROTECTED]): ***
Missing patches from partner xtla-xsteve:
Missing patches from partner xtla-main:
[EMAIL PROTECTED] [NOT MERGED]
tag of [EMAIL PROTECTED]
Matthieu Moy <[EMAIL PROTECTED]>
2004-11-07 21:39:53 GMT
[EMAIL PROTECTED] [NOT MERGED]
Documentation fixes [Matthieu (patch 115-116)]
Matthieu Moy <[EMAIL PROTECTED]>
2004-11-07 23:34:36 GMT
[EMAIL PROTECTED] [NOT MERGED]
Make building in a separate directory work again [EMAIL PROTECTED] (patch
7-8)]
Matthieu Moy <[EMAIL PROTECTED]>
2004-11-08 06:59:12 GMT
[EMAIL PROTECTED] [NOT MERGED]
".." after @abs_srcdir@ in load-path at compile time.
Matthieu Moy <[EMAIL PROTECTED]>
2004-11-08 07:49:13 GMT
[EMAIL PROTECTED] [NOT MERGED]
added a few patch-log entries from version 0.1 [Mainline (patch 0), Mark
(patch 0, 154), Stefan (patch 0, 129)]
Matthieu Moy <[EMAIL PROTECTED]>
2004-11-09 20:08:20 GMT
end.
The following happens, when I try to star-merge from Matthieus tree:
* build reference tree for [EMAIL PROTECTED]
* from archive cached: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
... some lines skipped ...
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
* patching for revision: [EMAIL PROTECTED]
star-merge: unable to merge unrelated trees.
What steps are necessary to merge Matthieus tree again. Is it already
possible via Xtla?
Stefan.
