[be] [ bibledit-Bugs-1938455 ] Merge: Common ancestor?

[SourceForge.net]

Bugs item #1938455, was opened at 2008-04-09 11:15
Message generated for change (Settings changed) made by teus
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=658621&aid=1938455&group_id=111189

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: BE 3.1
>Status: Pending
Resolution: None
Priority: 5
Private: No
Submitted By: Wolfgang Stradner (ewst)
Assigned to: Nobody/Anonymous (nobody)
Summary: Merge: Common ancestor?

Initial Comment:
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.


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=658621&aid=1938455&group_id=111189