[BackupPC-devel] Git branching

[Alexander Moisseev]

That looks like 3.x, while rsync-bpc and backuppc-xs are 4.x. Maybe we should have backuppc3 for 3.x, and backuppc is 4.x?

No, it will break workflow. We definitely should keep both as branches of the same project backuppc/backuppc.
IMHO we should keep rsync-bpc and backuppc-xs as separate projects (at least for now).

We can change branch names as Craig suggested (but IMHO it is questionable), but we should do it ASAP. Renaming a branch is a merely one command, but it is really deleting a branch, followed by pushing a new one with a new name. So it has implications. For example, if you have opened pull requests for the branch, the pull requests will be removed.

What should be done ASAP:
1. Finally choose branching model and branch names.
2. Import 4.x CVS code (if it exists).

------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[Craig Barratt]

Agreed; I misunderstood the setup.

However, I'd prefer 4.x to be the master branch, since that will have the
most development going forward.

Also, my github user name is craigbarratt.

Craig

That looks like 3.x, while rsync-bpc and backuppc-xs are 4.x. Maybe we

should have backuppc3 for 3.x, and backuppc is 4.x?
No, it will break workflow. We definitely should keep both as branches of
the same project backuppc/backuppc.
IMHO we should keep rsync-bpc and backuppc-xs as separate projects (at least for now).
We can change branch names as Craig suggested (but IMHO it is
questionable), but we should do it ASAP. Renaming a branch is a merely one
command, but it is really deleting a branch, followed by pushing a new one
with a new name. So it has implications. For example, if you have opened
pull requests for the branch, the pull requests will be removed.
1. Finally choose branching model and branch names.
2. Import 4.x CVS code (if it exists).
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[Alexander Moisseev]

Post by Craig Barratt
Agreed; I misunderstood the setup.
However, I'd prefer 4.x to be the master branch, since that will have the most development going forward.

Totally agreed.

Is there 4.x CVS code anywhere? Would you provide access to it for @larstobi so he could import it to the github repository?
For now v4.0.0 branch is the latest release tarball.





------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[Lars Tobias Skjong-Børsting]

Hi Craig,

Post by Craig Barratt
However, I'd prefer 4.x to be the master branch, since that will have
the most development going forward.

I'll branch out 3.x, then, and merge in 4.x to master.

Post by Craig Barratt
Also, my github user name is craigbarratt.

I've added you to the organization.
--
Best regards,
Lars Tobias


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[Alexander Moisseev]

Post by Lars Tobias Skjong-Børsting
I'll branch out 3.x, then, and merge in 4.x to master.

Do you really think it was a good idea to merge in the `master` v3 CVS with v4 release tarball (which in not "real" source code)?


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Projec

[Lars Tobias Skjong-Børsting]

Post by Alexander Moisseev

Post by Lars Tobias Skjong-Børsting
I'll branch out 3.x, then, and merge in 4.x to master.

Do you really think it was a good idea to merge in the `master` v3 CVS with v4 release tarball (which in not "real" source code)?

We don't have the real CVS tree, so it's all we have.

I'm sorry if this was a bad move. :( Do you think we should remove it?
--
Best regards,
Lars Tobias

------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.

[Alexander Moisseev]

Post by Lars Tobias Skjong-Børsting

Post by Alexander Moisseev

Post by Lars Tobias Skjong-Børsting
I'll branch out 3.x, then, and merge in 4.x to master.

Do you really think it was a good idea to merge in the `master` v3 CVS with v4 release tarball (which in not "real" source code)?

We don't have the real CVS tree, so it's all we have.

I believe Craig has some kind of source. Let's wait for his answer.
There are make files in v3 that make substitutions in CVS sources in order to build release tarball. I believe v4 follows the same ideology. So we shouldn't simply merge source and release code.

Post by Lars Tobias Skjong-Børsting
I'm sorry if this was a bad move. :( Do you think we should remove it?

IMHO yes, but I'd stop making any changes until we get feedback from Craig and interested contributors and come to some decision.

[Lars Tobias Skjong-Børsting]

Post by Alexander Moisseev
IMHO yes, but I'd stop making any changes until we get feedback from Craig and interested contributors and come to some decision.

Do I understand you correctly if you think I shouln't force-push master
back to the 3.x.x right now, but wait for an answer from Craig and others?
--
Best regards,
Lars Tobias

------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[Alexander Moisseev]

Post by Lars Tobias Skjong-Børsting

Post by Alexander Moisseev
IMHO yes, but I'd stop making any changes until we get feedback from Craig and interested contributors and come to some decision.

Do I understand you correctly if you think I shouln't force-push master
back to the 3.x.x right now, but wait for an answer from Craig and others?

I think you should eventually, but you can do it any time until you change anything else. My point was do not make any other changes in repository (except issue tracker) until we got Craig's reply on v4 sources and branch model finally settled down.

------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
BackupPC-devel mailing list
BackupPC-***@lists.sourceforge.net
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: h

[Lars Tobias Skjong-Børsting]

Hi,

It seems we are not going to get the v4 CVS tree anytime soon. Should we
make a plan to carry on forward with what we have already?

[Alexander Moisseev]

Post by Lars Tobias Skjong-Børsting
It seems we are not going to get the v4 CVS tree anytime soon. Should we
make a plan to carry on forward with what we have already?

It looks like Craig have converted (or started converting by hand release code to source) and started commiting in the master. As I take it, he doesn't have source code at all. Or I completely don't understand his intentions.

[Lars Tobias Skjong-Børsting]

Post by Alexander Moisseev
It looks like Craig have converted (or started converting by hand release code to source) and started commiting in the master. As I take it, he doesn't have source code at all. Or I completely don't understand his intentions.

Oh, wow, I didn't look at the github repo before posting. That's great.
I suppose that means that we've officially moved to github.

[Craig Barratt]

Yes, github is now official for all three projects. The master branch has
a number of changes / fixes for 4.x, and should be in releasable form. I'm
(slowly) working on Ftp.pm, which should be the last thing before a 4.0
release.

I committed some changes to rsync_bpc and backuppc-xs that fixes a subtle
crash, and I closed the corresponding issue.

Craig

On Tue, Aug 2, 2016 at 4:54 AM, Lars Tobias Skjong-BÞrsting <

Post by Alexander Moisseev

Post by Alexander Moisseev
It looks like Craig have converted (or started converting by hand

release code to source) and started commiting in the master. As I take it,
he doesn't have source code at all. Or I completely don't understand his
intentions.
Oh, wow, I didn't look at the github repo before posting. That's great.
I suppose that means that we've officially moved to github.
--
Lars Tobias
------------------------------------------------------------------------------
_______________________________________________
BackupPC-devel mailing list
List: https://lists.sourceforge.net/lists/listinfo/backuppc-devel
Wiki: http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

[François]

Post by Craig Barratt
Yes, github is now official for all three projects. The master branch has
a number of changes / fixes for 4.x, and should be in releasable form. I'm
(slowly) working on Ftp.pm, which should be the last thing before a 4.0
release.

Looks like I'll have to delete 3 repos on github then!
I do have some issues installing a working 4.0 version, no backups are performed.
Where should I ask for help?