[be] [task #8693] Collaboration (Help/Task) Include Merge

[Wolfgang Stradner]

URL:
  <http://savannah.nongnu.org/task/?8693>

                 Summary: Collaboration (Help/Task) Include Merge
                 Project: Bibledit
            Submitted by: ewst
            Submitted on: Mon 29 Sep 2008 11:54:32 AM GMT
         Should Start On: Mon 29 Sep 2008 12:00:00 AM GMT
   Should be Finished on: Mon 29 Sep 2008 12:00:00 AM GMT
                Priority: 5 - Normal
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

On the help page: collaboration.html include another item:
collaboration.html#Merging explaining.

Merging: In many cases it is an advantage to collaborate 2 projects not
directly (this would be a blind merge) but to use ..... (now use the
description 1---- and 2--- below) ....

1---------------------------------
We find ourselves in that situation too. Some of our typists do delete chunks
of text, or insert all kind of funny stuff by mistake. And we don't want such
thing to get "automatically" into the master project. The master project is
maintained by one person, and he's a very good typist and is very accurate.
Other typists can be expected to make a huge mess and that can't be allowed to
enter the master project.

The solution is to use two mechanisms of Bibledit simultanously.
1. Collaboration through the network or the USB stick.
2. Merging changes.

This is how to do it:

1. The experienced person has project "master" that has the master copy of
the Bible. Collaboration of the master project is switched off so that no
changes can enter that project by mistake.
2. The experienced person has project "messy" that initially is a copy of the
master project. Collaboration is switched on.
3. The unexperienced typist has project "messy" too, with collaboration
switched on.
4. The unexperienced typist makes changes in project "messy", and through
collaboration these changes go into project "messy" of the experienced typist
too. This all goes automatic.
5. Once in a while the experienced person goes to the Merge tool. He opens
project "master" and project "messy", reviews the changes as proposed in
project "messy", makes any edits he likes, takes out any mistakes he does not
like, and then finally merges the changes from "messy" into "master". This is
done chapter by chapter. Once the merge is done, project "master" and "messy"
are identical again in that particular chapter.
6. Any changes entered or not entered propagate to the unexperienced typist
again through the collaboration. If the unexperienced typist made a big mess
in a certain chapter, through the collaboration this mess is cleared up again
on his computer.

2-------------------------------------
In addition, this also has some advantages. Think of the situation that the
"messy" person is out in the bush, and comes to town with his stick, and has
little time for the master person to merge while he waits. So just plugging in
he stick, a quick automatic merge, and away he goes again. Then if the master
person has some time in the days or weeks following, he can then carefully go
through the messy project, and merge it with the master project taking his
time for it, and doing a good job.




    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/task/?8693>

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