[Phpmyadmin-devel] Feature branches in official repo
Hi all I see we have two feature branches on the repo, and I'm not convinced they are needed: unittesting - merged to master, it's probably okay to drop it? Or is there any future use of it? export_xml - contains some XML export improvements, however not trivially mergeable with master due to changes on both sides. Any plans with that one? -- Michal Čihař | http://cihar.com | http://blog.cihar.com
On 22-07-11 10:28, Michal Čihař wrote:
Hi all
I see we have two feature branches on the repo, and I'm not convinced they are needed:
unittesting - merged to master, it's probably okay to drop it? Or is there any future use of it?
It can be. I hadn't decided yet. But for new (experimental) tests I can always create a new branch. I've now removed it.
export_xml - contains some XML export improvements, however not trivially mergeable with master due to changes on both sides. Any plans with that one?
-- Met vriendelijke groet / Regards, Herman van Rink Initfour websolutions
2011/7/22 Michal Čihař <michal@cihar.com>:
Hi all
I see we have two feature branches on the repo, and I'm not convinced they are needed:
unittesting - merged to master, it's probably okay to drop it? Or is there any future use of it?
export_xml - contains some XML export improvements, however not trivially mergeable with master due to changes on both sides. Any plans with that one?
This one contains some improvements, but is not ready to merge yet, because some work needs to be done on the import side. But I don't have time to finish this yet. I have the changes locally, so I guess you can remove them from the repository. Kind regards, Dieter
Hi Dne Fri, 22 Jul 2011 20:25:54 +0200 Dieter Adriaenssens <dieter.adriaenssens@gmail.com> napsal(a):
2011/7/22 Michal Čihař <michal@cihar.com>:
Hi all
I see we have two feature branches on the repo, and I'm not convinced they are needed:
unittesting - merged to master, it's probably okay to drop it? Or is there any future use of it?
export_xml - contains some XML export improvements, however not trivially mergeable with master due to changes on both sides. Any plans with that one?
This one contains some improvements, but is not ready to merge yet, because some work needs to be done on the import side. But I don't have time to finish this yet. I have the changes locally, so I guess you can remove them from the repository.
Okay to keep it, if you still have some plans with that. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
participants (3)
-
Dieter Adriaenssens -
Herman van Rink -
Michal Čihař