[be] [bug #22949] Merge tool not working properly

[Teus Benschop]

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

                 Summary: Merge tool not working properly
                 Project: Bibledit
            Submitted by: teus
            Submitted on: Wednesday 04/16/2008 at 19:49
                Category: None
                Severity: 3 - Normal
              Item Group: None
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

Trying out the merge tool, I found the following (playing around with JUD
1:1 only)
Master1:
Jude, a servant of Christ Jesus and brother of James, to those who are
called, beloved in God the Father and kept for Jesus Christ:

copied to Master2: and changed (only the first 7 words to 8 words) to:
Jesus Christ's servant, called Jude, who is also a brother of James, to
those who are called, beloved in God the Father and kept for Jesus Christ:

then changed in Master1: Christ Jesus -> Jesus Christ

then Merge (1st try) shows :
\v 1 Jesus Christ's servant, called Jude, who is also a
__conflict__marker__after__ brother of James, __conflict__marker__before__
to __conflict__marker__middle__ To __conflict__marker__after__ those who
are called, beloved in God the Father and kept for Jesus Christ:
\m

Trying the same thing again (creating Master2 a second time making all the
described changes and using Merge (this time it does not look so weird):
\v 1 Jesus Christ's servant, called Jude, who is also a
__conflict__marker__after__ brother of James, to those who are called,
beloved in God the Father and kept for Jesus Christ:
To this 2nd try of Merge I attach a screen-shot to this report.



Found out, that 
- Merge (1st try) is trying to merge: Master2 with Master1,
- Merge (2nd try) is trying to merge: Master1 with Master2


I think that Project/Compare works in the wrong direction, because,
Example:
P1: Jude, a servant of Jesus Christ and the older brother of James, to
those who ...
P2: Jude, a new servant of Jesus Christ and brother of Jacques, to those
who ...
BE/Compare:
Jude, a new servant of Jesus Christ and the older brother of James,
Jacques, to those who ...
- strike-through for: new and Jacques,
- bold for: the older, James.
Shouldn't it be the other way round, that the words 'the older' which is
only in P1 and not in P2 should be marked by strike-through?




    _______________________________________________________

Reply to this item at:

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

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