Code Project

Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you have been placed in read-only mode.

Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).

Mercurial

The Lounge

4 Posts 2 Posters 1 Views 1 Watching

M Offline
M Offline
Mustafa Ismail Mustafa

wrote on last edited by

#1

Anyone here knows how to use it? Say I committed and pushed some changesets and my colleague pulled said changesets but he's got some of his own. He can't do a clean update because he needs to merge first and merging requires that he reverts back to previous revisions. Now, is it possible then to "roll forward" with all cumulative changesets post reverting and merging?

If the post was helpful, please vote, eh! Current activities: Playing Star Craft II. Don't bother me, eh? Now and forever, defiant to the end. What is Multiple Sclerosis[^]?
G 1 Reply Last reply

0
M Mustafa Ismail Mustafa

Anyone here knows how to use it? Say I committed and pushed some changesets and my colleague pulled said changesets but he's got some of his own. He can't do a clean update because he needs to merge first and merging requires that he reverts back to previous revisions. Now, is it possible then to "roll forward" with all cumulative changesets post reverting and merging?

If the post was helpful, please vote, eh! Current activities: Playing Star Craft II. Don't bother me, eh? Now and forever, defiant to the end. What is Multiple Sclerosis[^]?
G Offline
G Offline
GavErry

wrote on last edited by

#2

Why does he want to revert his changes before merging? A standard workflow is to merge the heads of two branches together. Gavin
M 1 Reply Last reply

0
G GavErry

Why does he want to revert his changes before merging? A standard workflow is to merge the heads of two branches together. Gavin
M Offline
M Offline
Mustafa Ismail Mustafa

wrote on last edited by

#3

Sorry Gavin, but I've been away from the computer all day. I can't remember the specifics but if my memory serves, the issue were with two binary files being tracked. Anyways, that was resolved... this time. What I worry about is the next time. I was wondering if it makes sense to branch/fork. We're a team working on a solution that has about 28 projects with each team member working on a project. Would it make sense to branch each developer off and then merge whenever the project is complete? My ultimate question here is how would the QA test each branch?

If the post was helpful, please vote, eh! Current activities: Playing Star Craft II. Don't bother me, eh? Now and forever, defiant to the end. What is Multiple Sclerosis[^]?
G 1 Reply Last reply

0
M Mustafa Ismail Mustafa

Sorry Gavin, but I've been away from the computer all day. I can't remember the specifics but if my memory serves, the issue were with two binary files being tracked. Anyways, that was resolved... this time. What I worry about is the next time. I was wondering if it makes sense to branch/fork. We're a team working on a solution that has about 28 projects with each team member working on a project. Would it make sense to branch each developer off and then merge whenever the project is complete? My ultimate question here is how would the QA test each branch?

If the post was helpful, please vote, eh! Current activities: Playing Star Craft II. Don't bother me, eh? Now and forever, defiant to the end. What is Multiple Sclerosis[^]?
G Offline
G Offline
GavErry

wrote on last edited by

#4

I'm would think the branch / merge workflow would make sense if there are multiple developers working on the same project. If all the projects are independent with one developer on each, then it might be better to make these subrepositories, pulling all the subrepos together when complete. There are far more knowledgeable people on http://mercurial.selenic.com/wiki/MailingLists[^] and they will be able to help in detail. Gavin
1 Reply Last reply

0