[be] [bug #22948] Merge: Common ancestor?

[Teus Benschop]

URL:
  <http://savannah.nongnu.org/bugs/?22948>

                 Summary: Merge: Common ancestor?
                 Project: Bibledit
            Submitted by: teus
            Submitted on: Wednesday 04/16/2008 at 19:47
                Category: None
                Severity: 3 - Normal
              Item Group: None
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

There is a detailed description of the merge tool in the helpf-file under
Help/Tools/File/Merge (Merge):
in order that 2 projects can be merged, 'both of the projects need to have
what is called a common ancestor... That means, there must be a moment in
time in the history of the projects that the data of the projects was the
same. Usually this is accomplished by making a copy of the main project.'
(according to help).

Testing out when is the requirement 'Common ancestor' is fulfilled?
- copy a whole project: OK
- importing the same book into both projects: not recognized as 'common
ancestor'.
- Exporting a book from one project and importing it into the other: not
recognized as 'common ancestor'.
(it does not matter, if File/Project/Import is used, or the one in
File/Project/Property).

So: adding a new book in a project (this is, what happens in the
translation process all the time) this book can only be worked on using the
merge tool if:
- one of the projects is deleted and
- a copy of the other project is made with the name of the other (deleted)
project.
Or did I missunderstand the situation?

-> Allow the merging of books, when an identic import takes place.




    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?22948>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/