SVN Re-include a revision

Multi tool use
Multi tool use











up vote
-1
down vote

favorite












Lets say I have 4 commits in my repository



Commit 1
Commit 2
Commit 3
Commit 4



I wanted to deploy a version of the code that did not include 2 and 3 and so I right clicked on these commits and clicked "Revert changes from this revison" for both of them. I checked the code and this correctly removed only these commits.



I then committed my local version and deployed the code.
Now I want to to include these commits again but I am unsure how to do this.



Any help would be appreciated.



Thanks!






svn version-control commit revert







share|improve this question
























  • Did you commit your code after reverting the two revisions?
    – royalTS
    Nov 8 at 10:03










  • Yes, I removed the two revisions and then committed.
    – semiColon
    Nov 8 at 10:17










  • So you could do the same thing, undo this revision and everything should be fine
    – royalTS
    Nov 8 at 12:13










  • Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
    – semiColon
    Nov 8 at 13:40










  • I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
    – royalTS
    Nov 8 at 14:30

















up vote
-1
down vote

favorite












Lets say I have 4 commits in my repository



Commit 1
Commit 2
Commit 3
Commit 4



I wanted to deploy a version of the code that did not include 2 and 3 and so I right clicked on these commits and clicked "Revert changes from this revison" for both of them. I checked the code and this correctly removed only these commits.



I then committed my local version and deployed the code.
Now I want to to include these commits again but I am unsure how to do this.



Any help would be appreciated.



Thanks!






svn version-control commit revert







share|improve this question
























  • Did you commit your code after reverting the two revisions?
    – royalTS
    Nov 8 at 10:03










  • Yes, I removed the two revisions and then committed.
    – semiColon
    Nov 8 at 10:17










  • So you could do the same thing, undo this revision and everything should be fine
    – royalTS
    Nov 8 at 12:13










  • Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
    – semiColon
    Nov 8 at 13:40










  • I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
    – royalTS
    Nov 8 at 14:30















up vote
-1
down vote

favorite









up vote
-1
down vote

favorite











Lets say I have 4 commits in my repository



Commit 1
Commit 2
Commit 3
Commit 4



I wanted to deploy a version of the code that did not include 2 and 3 and so I right clicked on these commits and clicked "Revert changes from this revison" for both of them. I checked the code and this correctly removed only these commits.



I then committed my local version and deployed the code.
Now I want to to include these commits again but I am unsure how to do this.



Any help would be appreciated.



Thanks!






svn version-control commit revert







share|improve this question















Lets say I have 4 commits in my repository



Commit 1
Commit 2
Commit 3
Commit 4



I wanted to deploy a version of the code that did not include 2 and 3 and so I right clicked on these commits and clicked "Revert changes from this revison" for both of them. I checked the code and this correctly removed only these commits.



I then committed my local version and deployed the code.
Now I want to to include these commits again but I am unsure how to do this.



Any help would be appreciated.



Thanks!






svn version-control commit revert




svn version-control commit revert






share|improve this question















share|improve this question













share|improve this question




share|improve this question








edited Nov 8 at 11:50

























asked Nov 8 at 10:00









semiColon

6613




6613












  • Did you commit your code after reverting the two revisions?
    – royalTS
    Nov 8 at 10:03










  • Yes, I removed the two revisions and then committed.
    – semiColon
    Nov 8 at 10:17










  • So you could do the same thing, undo this revision and everything should be fine
    – royalTS
    Nov 8 at 12:13










  • Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
    – semiColon
    Nov 8 at 13:40










  • I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
    – royalTS
    Nov 8 at 14:30




















  • Did you commit your code after reverting the two revisions?
    – royalTS
    Nov 8 at 10:03










  • Yes, I removed the two revisions and then committed.
    – semiColon
    Nov 8 at 10:17










  • So you could do the same thing, undo this revision and everything should be fine
    – royalTS
    Nov 8 at 12:13










  • Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
    – semiColon
    Nov 8 at 13:40










  • I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
    – royalTS
    Nov 8 at 14:30


















Did you commit your code after reverting the two revisions?
– royalTS
Nov 8 at 10:03




Did you commit your code after reverting the two revisions?
– royalTS
Nov 8 at 10:03












Yes, I removed the two revisions and then committed.
– semiColon
Nov 8 at 10:17




Yes, I removed the two revisions and then committed.
– semiColon
Nov 8 at 10:17












So you could do the same thing, undo this revision and everything should be fine
– royalTS
Nov 8 at 12:13




So you could do the same thing, undo this revision and everything should be fine
– royalTS
Nov 8 at 12:13












Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
– semiColon
Nov 8 at 13:40




Sorry, I failed to mention that after I removed commits 2 & 3, I then made some changes and committed these changes without 2 and 3. Then I deployed that code, and now I want to include 2 and 3 as well as the new changes I made.
– semiColon
Nov 8 at 13:40












I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
– royalTS
Nov 8 at 14:30






I would then take a look at the topic of patches. Maybe you can make a patch from your commits 2 and 3 and apply this one to your current working copy. make.wordpress.org/core/handbook/tutorials/working-with-patches svnbook.red-bean.com/en/1.8/svn.ref.svn.c.patch.html
– royalTS
Nov 8 at 14:30



















active

oldest

votes











Your Answer






StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");

StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});

function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});


}
});














 

draft saved


draft discarded


















StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53205349%2fsvn-re-include-a-revision%23new-answer', 'question_page');
}
);

Post as a guest























active

oldest

votes













active

oldest

votes









active

oldest

votes






active

oldest

votes
















 

draft saved


draft discarded



















































 


draft saved


draft discarded














StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53205349%2fsvn-re-include-a-revision%23new-answer', 'question_page');
}
);

Post as a guest






































































8t13epGFeUF8ktHkarFhrYQrtyncXUn,4WwC o2OcB,0pCSra A3J,vrcr9foA8nmPb0O
-
OKQF,aXjXZVwupdleuhaE,G8eT36U8 v,38byM1zZQESIZU8EAe4LC zPNw1g8j

Popular posts from this blog

Schultheiß

Image
Der Titel dieses Artikels ist mehrdeutig. Weitere Bedeutungen sind unter Schultheiß (Begriffsklärung) aufgeführt. Ein Schultheiß. Holzschnitt von Peter Flötner (16. Jahrhundert) Der Schultheiß oder Schuldheiß (von althochdeutsch  sculdheizo ‚Leistung Befehlender‘, vgl. mittelniederdeutsch  schult(h)ēte , latinisiert (mittellat.) sculte(t)us , schwäbisch heute noch Schultes für „Bürgermeister“) bezeichnet einen in vielen westgermanischen Rechtsordnungen vorgesehenen Beamten, der Schuld heischt : Er hatte im Auftrag seines Herren (Landesherrn, Stadtherrn, Grundherrn) die Mitglieder einer Gemeinde zur Leistung ihrer Schuldigkeit anzuhalten, also Abgaben einzuziehen oder für das Beachten anderer Verpflichtungen Sorge zu tragen. Sprachliche Varianten des Schultheißen sind Schulte , Schultes oder Schulze . Früher wurde zwischen dem Stadtschulzen und dem Dorfschulzen unterschieden. In der städtischen Gerichts- und Gemeindeverfassung war er ein vom städtischen Rat oder vom L...
Read more

how to define a CAPL function taking a sysvar argument

Image
up vote 0 down vote favorite In Vector CANoe, is it possible to define a function that takes a system variable argument like the system function TestWaitForSignalMatch() ? For my use case it is not sufficient to supply the current value of the system variable because I want to pass the system variable to TestWaitForSignalMatch() or similar system functions. The CANoe help seems to show examples: long TestWaitForSignalMatch (Signal aSignal, float aCompareValue, dword aTimeout); // form 1 long TestWaitForSignalMatch (sysvar aSysVar, float aCompareValue, dword aTimeout); // form 3 I tried like this void foo(sysvar aSysvar) {} ^ or this void foo(sysvar *aSysvar) {} ^ but I get a parse error at the marked position of the sysvar keyword in both cases. I successfully created functions that take a...
Read more

Krone von Aragonien

Image
Wappenschild der Krone von Aragonien Die Länder der Krone Aragon (hellblaue Gebiete: nur kurzzeitig oder indirekt unter aragonesischer Herrschaft) Herrschaftsgebiet zur Zeit Ramon Berenguers IV. Krone von Aragonien im 13. Jahrhundert Krone von Aragonien im 15. Jahrhundert Unter dem Begriff Krone von Aragonien ( spanisch Corona de Aragón , aragonesisch Corona d’Aragón , katalanisch Corona d’Aragó ) werden Herrschaftsgebiete unterschiedlicher Verfasstheit zusammengefasst, die zwischen 1137 und 1516 bzw. 1714 in Personalunion von den Königen von Aragonien regiert wurden. Dazu gehörten Königreiche wie Aragonien, Mallorca, Valencia, Sizilien, Sardinien, Korsika und Neapel, das Herzogtum Athen und Neopatria, die Markgrafschaft Provence, die Grafschaften Barcelona, Roussillon und Cerdanya und die Herrschaft Montpellier. [1] Die Herrscher der Krone von Aragonien und von Spanien zählten und zählen in ihrer Titulatur eine große Anzahl von Herrschaftsgebieten auf. Dies...
Read more