Skip to main content
added 284 characters in body
Source Link
user397232
  • 1.8k
  • 6
  • 22
  • 30

First, sorry because of my poor English and explanation. This is the edited version of my question after receiving some comments and I realize what made you confused.

The project I'm working on has about 10 people and each person will implement some modules"work" in the project.

  • We share 20 model files (text files)
  • When people do "work", they have to go directly to model files and add/remove/edit some lines in 20 text files above.

Assume that:

  • A implemented moduleswork no. 1, 4, 6, and 10.
  • B implemented moduleswork no. 2, 3, 7, and 9.
  • ...

A implemented module 4(4) before B implemented module 7.
Some global values in module 4 is overridden by module 7 (by edit/delete/add7). In file X, some configuration values/lines changed by (4). And this is totally acceptable are overridden by (for better performance7).

Later when we run the performanceenergy saving evaluation and find out module 4(4) actually slows the whole system down anddoesn't save energy at all so we decide to take module 4(4) out.

So the question is that, if we have any Version Control tothat can take module 4 (4) (implemented by A) out WITHOUT touching any overridden values/lines made in module 7by (7) (implemented by B).
In other words, we can remove module 4 and don't needI want to do any additionalremove all the changes made by A for the work to correct module 7number (4) ONLY. Work 1, 6, 10 done by A are still in the model files.

Right now we are using RCS... but I don't know if RCS can do it and how?
I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

ThanksSorry again and thanks for your time.

The project I'm working on has about 10 people and each person will implement some modules in the project.

Assume that:

  • A implemented modules 1, 4, 6, and 10.
  • B implemented modules 2, 3, 7, and 9.
  • ...

A implemented module 4 before B implemented module 7.
Some global values in module 4 is overridden by module 7 (by edit/delete/add some configuration values/lines). And this is totally acceptable (for better performance).

Later when we run the performance evaluation and find out module 4 actually slows the whole system down and we decide to take module 4 out.

So the question is that, if we have any Version Control to take module 4 (implemented by A) out WITHOUT touching any overridden values made in module 7 (implemented by B).
In other words, we can remove module 4 and don't need to do any additional work to correct module 7.

Right now we are using RCS... but I don't know if RCS can do it and how?
I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Thanks.

First, sorry because of my poor English and explanation. This is the edited version of my question after receiving some comments and I realize what made you confused.

The project I'm working on has about 10 people and each person will implement some "work" in the project.

  • We share 20 model files (text files)
  • When people do "work", they have to go directly to model files and add/remove/edit some lines in 20 text files above.

Assume that:

  • A implemented work no. 1, 4, 6, and 10.
  • B implemented work no. 2, 3, 7, and 9.
  • ...

A implemented (4) before B implemented (7). In file X, some values/lines changed by (4) are overridden by (7).

Later when we run the energy saving evaluation and find out (4) actually doesn't save energy at all so we decide to take (4) out.

So the question is that if we have any Version Control that can take (4) (implemented by A) out WITHOUT touching any overridden values/lines made by (7) (implemented by B).
In other words, I want to remove all the changes made by A for the work number (4) ONLY. Work 1, 6, 10 done by A are still in the model files.

Right now we are using RCS... but I don't know if RCS can do it and how?
I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Sorry again and thanks for your time.

format question; added 4 characters in body
Source Link
VonC
  • 1.4m
  • 569
  • 4.8k
  • 5.7k

The project I'm working on has about 10 people and each person will implement some modules in the project.

Assume that:

A implemented modules 1, 4, 6, and 10. B implemented modules 2, 3, 7, and 9. ...

  • A implemented modules 1, 4, 6, and 10.
  • B implemented modules 2, 3, 7, and 9.
  • ...

AA implemented module 4 before BB implemented module 7. Some
Some global values in module 4 is overridden by module 7 (by edit/delete/add some configuration values/lines). And this is totally acceptable (for better performance).

Later when we run the performance evaluation and find out module 4 actually slows the whole system down and we decide to take module 4 out. 

So the question is that, if we have any Version Control to take module 4 (implemented by AA) out WITHOUT touching any overridden values made in module 7 (implemented by BB). In
In other words, we can remove module 4 and don't need to do any additional work to correct module 7.

Right now we are using RCS... but I don't know if RCS can do it and how? I'm
I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Thanks.

The project I'm working on has about 10 people and each person will implement some modules in the project.

Assume that:

A implemented modules 1, 4, 6, and 10. B implemented modules 2, 3, 7, and 9. ...

A implemented module 4 before B implemented module 7. Some global values in module 4 is overridden by module 7 (by edit/delete/add some configuration values/lines). And this is totally acceptable (for better performance).

Later when we run the performance evaluation and find out module 4 actually slows the whole system down and we decide to take module 4 out. So the question is that if we have any Version Control to take module 4 (implemented by A) out WITHOUT touching any overridden values made in module 7 (implemented by B). In other words, we can remove module 4 and don't need to do any additional work to correct module 7.

Right now we are using RCS... but I don't know if RCS can do it and how? I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Thanks.

The project I'm working on has about 10 people and each person will implement some modules in the project.

Assume that:

  • A implemented modules 1, 4, 6, and 10.
  • B implemented modules 2, 3, 7, and 9.
  • ...

A implemented module 4 before B implemented module 7.
Some global values in module 4 is overridden by module 7 (by edit/delete/add some configuration values/lines). And this is totally acceptable (for better performance).

Later when we run the performance evaluation and find out module 4 actually slows the whole system down and we decide to take module 4 out. 

So the question is that, if we have any Version Control to take module 4 (implemented by A) out WITHOUT touching any overridden values made in module 7 (implemented by B).
In other words, we can remove module 4 and don't need to do any additional work to correct module 7.

Right now we are using RCS... but I don't know if RCS can do it and how?
I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Thanks.

Source Link
user397232
  • 1.8k
  • 6
  • 22
  • 30

version control

The project I'm working on has about 10 people and each person will implement some modules in the project.

Assume that:

A implemented modules 1, 4, 6, and 10. B implemented modules 2, 3, 7, and 9. ...

A implemented module 4 before B implemented module 7. Some global values in module 4 is overridden by module 7 (by edit/delete/add some configuration values/lines). And this is totally acceptable (for better performance).

Later when we run the performance evaluation and find out module 4 actually slows the whole system down and we decide to take module 4 out. So the question is that if we have any Version Control to take module 4 (implemented by A) out WITHOUT touching any overridden values made in module 7 (implemented by B). In other words, we can remove module 4 and don't need to do any additional work to correct module 7.

Right now we are using RCS... but I don't know if RCS can do it and how? I'm considering GIT and SVN. I think SVN is more appropriate since all data in the project is put in 1 place (1 folder). Our server is Linux Red Hat.

If you experienced this, please share.

Thanks.